summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2010-07-28 10:33:27 -0700
committerCarl Worth <cworth@cworth.org>2010-07-28 10:33:27 -0700
commit14a3d61ea37c0b0a2bf211a12118e592c3e0677b (patch)
treefdd4c70fc453668218d4f34b20307f9566ed9dd5
parent742ee7935da60dda974795243d2e0fcf31accb59 (diff)
Avoid compiler warning for unused glx_dpy variable.
My earlier attempt to eliminate this warning (c0ca2bfb2ad8c) was invalid as it removed the variable declaration. Jerome correctly reverted that (600c85efdb0ff) since the variable is used when X_DRI2SwapBuffers is defined. Here, instead of removing the declaration, we move it to inside the correct #ifdef.
-rw-r--r--src/glx/dri2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index d53431c19a6..f288ab81835 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -88,7 +88,6 @@ static Bool
DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
- __GLXdisplayPrivate *glx_dpy = __glXInitialize(dpy);
XextCheckExtension(dpy, info, dri2ExtensionName, False);
@@ -100,6 +99,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event;
xDRI2BufferSwapComplete *awire = (xDRI2BufferSwapComplete *)wire;
__GLXDRIdrawable *pdraw;
+ __GLXdisplayPrivate *glx_dpy = __glXInitialize(dpy);
/* Ignore swap events if we're not looking for them */
pdraw = dri2GetGlxDrawableFromXDrawableId(dpy, awire->drawable);