summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2007-03-05 15:31:44 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2007-03-05 15:31:44 -0800
commit689d52b6242434507a64a8fff27b01607628c393 (patch)
tree4122fab2651654db5ce623734b7e26c0be50541b
parentfe7b8f4237874e3e45fe25a6bf06faddfa1ab8e1 (diff)
Bugzilla #7145: fix build with gcc 2.95
Bugzilla #7145: <http://bugs.freedesktop.org/show_bug.cgi?id=7145> Patch #8987: <http://bugs.freedesktop.org/attachment.cgi?id=8987>
-rw-r--r--GL/glx/glxcmdsswap.c4
-rw-r--r--randr/rrcrtc.c2
-rw-r--r--randr/rroutput.c2
-rw-r--r--randr/rrpointer.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index d59dfdb4c..1857bc1eb 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@@ -496,11 +496,11 @@ int __glXDispSwap_CopySubBufferMESA(__GLXclientState *cl, GLbyte *pc)
GLXDrawable *drawId;
int *buffer;
+ __GLX_DECLARE_SWAP_VARIABLES;
+
(void) drawId;
(void) buffer;
- __GLX_DECLARE_SWAP_VARIABLES;
-
pc += __GLX_VENDPRIV_HDR_SIZE;
__GLX_SWAP_SHORT(&req->length);
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 1f7462f28..db506f4b0 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -490,7 +490,7 @@ RRCrtcInit (void)
int
ProcRRGetCrtcInfo (ClientPtr client)
{
- REQUEST(xRRGetCrtcInfoReq);;
+ REQUEST(xRRGetCrtcInfoReq);
xRRGetCrtcInfoReply rep;
RRCrtcPtr crtc;
CARD8 *extra;
diff --git a/randr/rroutput.c b/randr/rroutput.c
index a66433015..df1741f5c 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -366,7 +366,7 @@ RROutputInit (void)
int
ProcRRGetOutputInfo (ClientPtr client)
{
- REQUEST(xRRGetOutputInfoReq);;
+ REQUEST(xRRGetOutputInfoReq);
xRRGetOutputInfoReply rep;
RROutputPtr output;
CARD8 *extra;
diff --git a/randr/rrpointer.c b/randr/rrpointer.c
index 802dcb2c4..c88a0f83e 100644
--- a/randr/rrpointer.c
+++ b/randr/rrpointer.c
@@ -103,7 +103,7 @@ void
RRPointerMoved (ScreenPtr pScreen, int x, int y)
{
rrScrPriv (pScreen);
- RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc;;
+ RRCrtcPtr pointerCrtc = pScrPriv->pointerCrtc;
int c;
/* Check last known CRTC */