diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-06-05 19:26:19 -0400 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-06-05 20:52:14 -0400 |
| commit | 7cdf969527fa6d753ad2eb3dd971fe16725eb440 (patch) | |
| tree | 33e4200a4c1278940b1f70b495039ee67dc61c79 | |
| parent | 1d24e6ec1d13c2b88b858997900aa8b69de92b13 (diff) | |
apple: Change from XExtDisplayInfo to struct glx_display
Fixes regression introduced by: ab434f6b7641a64d30725a9ac24929240362d466 and
c356f5867f2c1fad7155df538b9affa8dbdcf869
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/glx/apple/glx_error.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/glx/apple/glx_error.c b/src/glx/apple/glx_error.c index b3a071c307b..d44a80ca659 100644 --- a/src/glx/apple/glx_error.c +++ b/src/glx/apple/glx_error.c @@ -27,22 +27,24 @@ prior written authorization. */ #include <stdbool.h> +#include <assert.h> #include <X11/Xlibint.h> #include <X11/extensions/extutil.h> #include <X11/extensions/Xext.h> #include "glxclient.h" #include "glx_error.h" -extern XExtDisplayInfo *__glXFindDisplay(Display * dpy); - void __glXSendError(Display * dpy, int errorCode, unsigned long resourceID, unsigned long minorCode, bool coreX11error) { - XExtDisplayInfo *info = __glXFindDisplay(dpy); + struct glx_display *glx_dpy = __glXInitialize(dpy); struct glx_context *gc = __glXGetCurrentContext(); xError error; + assert(glx_dpy); + assert(gc); + LockDisplay(dpy); error.type = X_Error; @@ -51,7 +53,7 @@ __glXSendError(Display * dpy, int errorCode, unsigned long resourceID, error.errorCode = errorCode; } else { - error.errorCode = info->codes->first_error + errorCode; + error.errorCode = glx_dpy->codes->first_error + errorCode; } error.sequenceNumber = dpy->request; |