summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2008-10-12 16:38:27 +0200
committerBrian <brianp@vmware.com>2009-01-11 16:53:40 -0700
commitbecdd43ed9b0635b2a52f265c291bae043678b3d (patch)
tree7f7913b5b8b8abcb6d1a1b9be0bec4519246439b
parentbb3836b58b4d9af5211070e2ebef415657607195 (diff)
downloadmesa_7_2_branch.tar.gz
Build fixes for gcc 2.95mesa_7_2_branch
-rw-r--r--src/glx/x11/drisw_glx.c6
-rw-r--r--src/glx/x11/glxcurrent.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/glx/x11/drisw_glx.c b/src/glx/x11/drisw_glx.c
index bcf7e144ef6..05ab9148433 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 d40f87637eb..efacefc7bd5 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;