Mesa (master): glx: gcc 2.95 build fix (move declaration before code)

Brian Paul brianp at kemper.freedesktop.org
Sun Jan 18 17:00:55 UTC 2009


Module: Mesa
Branch: master
Commit: b7f802eca2c78397ea7b8472b3a7e90a997fc140
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7f802eca2c78397ea7b8472b3a7e90a997fc140

Author: Brian Paul <brianp at vmware.com>
Date:   Sun Jan 18 09:59:07 2009 -0700

glx: gcc 2.95 build fix (move declaration before code)

Adapted from patch by Matthieu Herbb <matthieu.herrb at laas.fr>

---

 src/glx/x11/glxcmds.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 1d373ed..c68b6ac 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -864,6 +864,12 @@ PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
     GLXContext gc;
     GLXContextTag tag;
     CARD8 opcode;
+#ifdef USE_XCB
+    xcb_connection_t *c;
+#else
+    xGLXSwapBuffersReq *req;
+#endif
+
 #ifdef GLX_DIRECT_RENDERING
     __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, NULL);
 
@@ -892,12 +898,10 @@ PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
     }
 
 #ifdef USE_XCB
-    xcb_connection_t* c = XGetXCBConnection(dpy);
+    c = XGetXCBConnection(dpy);
     xcb_glx_swap_buffers(c, tag, drawable);
     xcb_flush(c);
 #else
-    xGLXSwapBuffersReq *req;
-
     /* Send the glXSwapBuffers request */
     LockDisplay(dpy);
     GetReq(GLXSwapBuffers,req);




More information about the mesa-commit mailing list