--- 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;