Index: config/cf/sco5.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v
retrieving revision 1.8
diff -u -3 -p -r1.8 sco5.cf
--- config/cf/sco5.cf	21 Nov 2005 01:16:18 -0000	1.8
+++ config/cf/sco5.cf	19 Dec 2005 23:58:15 -0000
@@ -69,7 +69,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1
 #endif
 
 #ifndef UseExportLists
-# define UseExportLists		YES
+# define UseExportLists		NO
 #endif
 
 #define StandardDefines		-DSYSV -Di386 -DSCO325 -D__SCO__
Index: config/cf/usl.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/usl.cf,v
retrieving revision 1.4
diff -u -3 -p -r1.4 usl.cf
--- config/cf/usl.cf	21 Nov 2005 01:16:18 -0000	1.4
+++ config/cf/usl.cf	19 Dec 2005 23:58:15 -0000
@@ -159,7 +159,7 @@ XCOMM operating system: OSName (OSMajorV
 #endif
 
 #ifndef UseExportLists
-# define UseExportLists		YES
+# define UseExportLists		NO
 #endif
 
 #define GencatFlags		-m
Index: extras/Mesa/src/mesa/swrast/s_tritemp.h
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/swrast/s_tritemp.h,v
retrieving revision 1.1.1.5
diff -u -3 -p -r1.1.1.5 s_tritemp.h
--- extras/Mesa/src/mesa/swrast/s_tritemp.h	1 Dec 2005 03:13:01 -0000	1.1.1.5
+++ extras/Mesa/src/mesa/swrast/s_tritemp.h	19 Dec 2005 23:58:16 -0000
@@ -1156,7 +1156,7 @@ static void NAME(GLcontext *ctx, const S
 #ifdef INTERP_INDEX
                   CLAMP_INTERPOLANT(index, indexStep, len);
 #endif
-                  RENDER_SPAN( span );
+                  { RENDER_SPAN( span ); }
                }
 
                /*
