X11R6.8.2rc1 build problem

I've been running build and run tests for RC1, and found a build problem
with gcc 2.96 in Mesa.  The problem is that "(void)rmesa" was added to
LOCAL_VARS to eliminate compiler warnings; however, in t_dd_dmatmp.h and
t_dd_dmatmp2.h, there are additional declarations after LOCAL_VARS.
This causes the build to fail on gcc 2.96.

Note this is _not_ a problem with gcc 3.4.2.

Below is a patch to workaround the problem, but it might better to add a
ELIMINATE_WARNINGS define with the list of "(void)var;"'s that need to
be used to eliminate compiler warnings, and then add ELIMINATE_WARNINGS
to the appropriate functions in t_dd_dmatmp.h and t_dd_dmatmp2.h.

I will continue my testing of RC1 this evening and report back any other
problems that I find.


Index: extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c,v
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2.2.1 r200_tcl.c
--- extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c	15 Dec 2004 01:50:58 -0000	1.1.1.2.2.1
+++ extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c	18 Dec 2004 04:51:47 -0000
@@ -101,7 +101,7 @@
 };
    
 
-#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx); (void)rmesa
+#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx)
 #define ELT_TYPE  GLushort
 
 #define ELT_INIT(prim, hw_prim) \
Index: extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c,v
retrieving revision 1.1.1.3.2.1
diff -u -r1.1.1.3.2.1 radeon_swtcl.c
--- extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c	15 Dec 2004 01:50:58 -0000	1.1.1.3.2.1
+++ extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c	18 Dec 2004 04:51:47 -0000
@@ -508,7 +508,7 @@
 
 
 
-#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa
+#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx)
 #define ELTS_VARS( buf )  GLushort *dest = buf
 #define INIT( prim ) radeonDmaPrimitive( rmesa, prim )
 #define ELT_INIT(prim) radeonEltPrimitive( rmesa, prim )
Index: extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c,v
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2.2.1 radeon_tcl.c
--- extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c	15 Dec 2004 01:50:58 -0000	1.1.1.2.2.1
+++ extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c	18 Dec 2004 04:51:47 -0000
@@ -105,7 +105,7 @@
 };
    
 
-#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa
+#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx)
 #define ELT_TYPE  GLushort
 
 #define ELT_INIT(prim, hw_prim) \