--- GL/glx/glxcmdsswap.orig	Wed Jan 24 18:43:16 2007
+++ GL/glx/glxcmdsswap.c	Wed Jan 24 18:43:51 2007
@@ -496,10 +496,10 @@ int __glXDispSwap_CopySubBufferMESA(__GL
     GLXDrawable		 *drawId;
     int			 *buffer;
 
+    __GLX_DECLARE_SWAP_VARIABLES;
+
     (void) drawId;
     (void) buffer;
-
-    __GLX_DECLARE_SWAP_VARIABLES;
 
     pc += __GLX_VENDPRIV_HDR_SIZE;
 
--- randr/rrcrtc.orig	Mon Mar  5 18:30:03 2007
+++ randr/rrcrtc.c	Mon Mar  5 18:30:37 2007
@@ -488,7 +488,7 @@ RRCrtcInit (void)
 int
 ProcRRGetCrtcInfo (ClientPtr client)
 {
-    REQUEST(xRRGetCrtcInfoReq);;
+    REQUEST(xRRGetCrtcInfoReq);
     xRRGetCrtcInfoReply	rep;
     RRCrtcPtr			crtc;
     CARD8			*extra;
--- randr/rroutput.orig	Mon Mar  5 18:31:45 2007
+++ randr/rroutput.c	Mon Mar  5 18:32:10 2007
@@ -444,7 +444,7 @@ RROutputInit (void)
 int
 ProcRRGetOutputInfo (ClientPtr client)
 {
-    REQUEST(xRRGetOutputInfoReq);;
+    REQUEST(xRRGetOutputInfoReq);
     xRRGetOutputInfoReply	rep;
     RROutputPtr			output;
     CARD8			*extra;
--- randr/rrpointer.orig	Mon Mar  5 18:32:47 2007
+++ randr/rrpointer.c	Mon Mar  5 18:33:02 2007
@@ -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 */