Mesa (mesa_7_2_branch): Build fixes for gcc 2.95

[Brian Paul]

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

Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Oct 12 16:38:27 2008 +0200

Build fixes for gcc 2.95

---

 src/glx/x11/drisw_glx.c  |    6 +++---
 src/glx/x11/glxcurrent.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/glx/x11/drisw_glx.c b/src/glx/x11/drisw_glx.c
index bcf7e14..05ab914 100644
--- a/src/glx/x11/drisw_glx.c
+++ b/src/glx/x11/drisw_glx.c
@@ -114,7 +114,7 @@ swrastGetDrawableInfo(__DRIdrawable *draw,
 		      void *loaderPrivate)
 {
     __GLXDRIdrawablePrivate *pdp = loaderPrivate;
-    __GLXDRIdrawable *pdraw = &(pdp->base);;
+    __GLXDRIdrawable *pdraw = &(pdp->base);
     Display *dpy = pdraw->psc->dpy;
     Drawable drawable;
 
@@ -143,7 +143,7 @@ swrastPutImage(__DRIdrawable *draw, int op,
 	       void *loaderPrivate)
 {
     __GLXDRIdrawablePrivate *pdp = loaderPrivate;
-    __GLXDRIdrawable *pdraw = &(pdp->base);;
+    __GLXDRIdrawable *pdraw = &(pdp->base);
     Display *dpy = pdraw->psc->dpy;
     Drawable drawable;
     XImage *ximage;
@@ -179,7 +179,7 @@ swrastGetImage(__DRIdrawable *draw,
 	       void *loaderPrivate)
 {
     __GLXDRIdrawablePrivate *pdp = loaderPrivate;
-    __GLXDRIdrawable *pdraw = &(pdp->base);;
+    __GLXDRIdrawable *pdraw = &(pdp->base);
     Display *dpy = pdraw->psc->dpy;
     Drawable drawable;
     XImage *ximage;
diff --git a/src/glx/x11/glxcurrent.c b/src/glx/x11/glxcurrent.c
index d40f876..efacefc 100644
--- a/src/glx/x11/glxcurrent.c
+++ b/src/glx/x11/glxcurrent.c
@@ -354,7 +354,7 @@ static Bool MakeContextCurrent(Display *dpy, GLXDrawable draw,
     const CARD8 oldOpcode = ((gc == oldGC) || (oldGC == &dummyContext))
       ? opcode : __glXSetupForCommand(oldGC->currentDpy);
     Bool bindReturnValue;
-
+    __GLXattribute *state;
 
     if (!opcode || !oldOpcode) {
 	return GL_FALSE;
@@ -475,7 +475,7 @@ static Bool MakeContextCurrent(Display *dpy, GLXDrawable draw,
                } while (0);
 #endif
 
-		__GLXattribute *state = 
+		state = 
 		  (__GLXattribute *)(gc->client_state_private);
 
 		gc->currentContextTag = reply.contextTag;