This patch removes 462 pairs of gcc-3.4.3 warnings: "xxx" redefined this is the location of the previous definition Make defines in xc/lib/GL/mesa/drivers/dri/r200/r200_reg.h identical to those in xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h #undef before #define for symbols defined (=1) from commandline xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h diff -ur -N XOrg-6.8.2.orig/xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_reg.h XOrg-6.8.2/xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_reg.h --- XOrg-6.8.2.orig/xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_reg.h 2004-06-16 11:18:15.000000000 +0200 +++ XOrg-6.8.2/xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_reg.h 2005-03-23 17:05:09.000000000 +0100 @@ -1028,54 +1028,54 @@ #define R200_TXC_ARG_A_TFACTOR1_ALPHA (27) #define R200_TXC_ARG_A_MASK (31 << 0) #define R200_TXC_ARG_A_SHIFT 0 -#define R200_TXC_ARG_B_ZERO (0<<5) -#define R200_TXC_ARG_B_CURRENT_COLOR (2<<5) -#define R200_TXC_ARG_B_CURRENT_ALPHA (3<<5) -#define R200_TXC_ARG_B_DIFFUSE_COLOR (4<<5) -#define R200_TXC_ARG_B_DIFFUSE_ALPHA (5<<5) -#define R200_TXC_ARG_B_SPECULAR_COLOR (6<<5) -#define R200_TXC_ARG_B_SPECULAR_ALPHA (7<<5) -#define R200_TXC_ARG_B_TFACTOR_COLOR (8<<5) -#define R200_TXC_ARG_B_TFACTOR_ALPHA (9<<5) -#define R200_TXC_ARG_B_R0_COLOR (10<<5) -#define R200_TXC_ARG_B_R0_ALPHA (11<<5) -#define R200_TXC_ARG_B_R1_COLOR (12<<5) -#define R200_TXC_ARG_B_R1_ALPHA (13<<5) -#define R200_TXC_ARG_B_R2_COLOR (14<<5) -#define R200_TXC_ARG_B_R2_ALPHA (15<<5) -#define R200_TXC_ARG_B_R3_COLOR (16<<5) -#define R200_TXC_ARG_B_R3_ALPHA (17<<5) -#define R200_TXC_ARG_B_R4_COLOR (18<<5) -#define R200_TXC_ARG_B_R4_ALPHA (19<<5) -#define R200_TXC_ARG_B_R5_COLOR (20<<5) -#define R200_TXC_ARG_B_R5_ALPHA (21<<5) -#define R200_TXC_ARG_B_TFACTOR1_COLOR (26<<5) -#define R200_TXC_ARG_B_TFACTOR1_ALPHA (27<<5) +#define R200_TXC_ARG_B_ZERO (0 << 5) +#define R200_TXC_ARG_B_CURRENT_COLOR (2 << 5) +#define R200_TXC_ARG_B_CURRENT_ALPHA (3 << 5) +#define R200_TXC_ARG_B_DIFFUSE_COLOR (4 << 5) +#define R200_TXC_ARG_B_DIFFUSE_ALPHA (5 << 5) +#define R200_TXC_ARG_B_SPECULAR_COLOR (6 << 5) +#define R200_TXC_ARG_B_SPECULAR_ALPHA (7 << 5) +#define R200_TXC_ARG_B_TFACTOR_COLOR (8 << 5) +#define R200_TXC_ARG_B_TFACTOR_ALPHA (9 << 5) +#define R200_TXC_ARG_B_R0_COLOR (10 << 5) +#define R200_TXC_ARG_B_R0_ALPHA (11 << 5) +#define R200_TXC_ARG_B_R1_COLOR (12 << 5) +#define R200_TXC_ARG_B_R1_ALPHA (13 << 5) +#define R200_TXC_ARG_B_R2_COLOR (14 << 5) +#define R200_TXC_ARG_B_R2_ALPHA (15 << 5) +#define R200_TXC_ARG_B_R3_COLOR (16 << 5) +#define R200_TXC_ARG_B_R3_ALPHA (17 << 5) +#define R200_TXC_ARG_B_R4_COLOR (18 << 5) +#define R200_TXC_ARG_B_R4_ALPHA (19 << 5) +#define R200_TXC_ARG_B_R5_COLOR (20 << 5) +#define R200_TXC_ARG_B_R5_ALPHA (21 << 5) +#define R200_TXC_ARG_B_TFACTOR1_COLOR (26 << 5) +#define R200_TXC_ARG_B_TFACTOR1_ALPHA (27 << 5) #define R200_TXC_ARG_B_MASK (31 << 5) #define R200_TXC_ARG_B_SHIFT 5 -#define R200_TXC_ARG_C_ZERO (0<<10) -#define R200_TXC_ARG_C_CURRENT_COLOR (2<<10) -#define R200_TXC_ARG_C_CURRENT_ALPHA (3<<10) -#define R200_TXC_ARG_C_DIFFUSE_COLOR (4<<10) -#define R200_TXC_ARG_C_DIFFUSE_ALPHA (5<<10) -#define R200_TXC_ARG_C_SPECULAR_COLOR (6<<10) -#define R200_TXC_ARG_C_SPECULAR_ALPHA (7<<10) -#define R200_TXC_ARG_C_TFACTOR_COLOR (8<<10) -#define R200_TXC_ARG_C_TFACTOR_ALPHA (9<<10) -#define R200_TXC_ARG_C_R0_COLOR (10<<10) -#define R200_TXC_ARG_C_R0_ALPHA (11<<10) -#define R200_TXC_ARG_C_R1_COLOR (12<<10) -#define R200_TXC_ARG_C_R1_ALPHA (13<<10) -#define R200_TXC_ARG_C_R2_COLOR (14<<10) -#define R200_TXC_ARG_C_R2_ALPHA (15<<10) -#define R200_TXC_ARG_C_R3_COLOR (16<<10) -#define R200_TXC_ARG_C_R3_ALPHA (17<<10) -#define R200_TXC_ARG_C_R4_COLOR (18<<10) -#define R200_TXC_ARG_C_R4_ALPHA (19<<10) -#define R200_TXC_ARG_C_R5_COLOR (20<<10) -#define R200_TXC_ARG_C_R5_ALPHA (21<<10) -#define R200_TXC_ARG_C_TFACTOR1_COLOR (26<<10) -#define R200_TXC_ARG_C_TFACTOR1_ALPHA (27<<10) +#define R200_TXC_ARG_C_ZERO (0 << 10) +#define R200_TXC_ARG_C_CURRENT_COLOR (2 << 10) +#define R200_TXC_ARG_C_CURRENT_ALPHA (3 << 10) +#define R200_TXC_ARG_C_DIFFUSE_COLOR (4 << 10) +#define R200_TXC_ARG_C_DIFFUSE_ALPHA (5 << 10) +#define R200_TXC_ARG_C_SPECULAR_COLOR (6 << 10) +#define R200_TXC_ARG_C_SPECULAR_ALPHA (7 << 10) +#define R200_TXC_ARG_C_TFACTOR_COLOR (8 << 10) +#define R200_TXC_ARG_C_TFACTOR_ALPHA (9 << 10) +#define R200_TXC_ARG_C_R0_COLOR (10 << 10) +#define R200_TXC_ARG_C_R0_ALPHA (11 << 10) +#define R200_TXC_ARG_C_R1_COLOR (12 << 10) +#define R200_TXC_ARG_C_R1_ALPHA (13 << 10) +#define R200_TXC_ARG_C_R2_COLOR (14 << 10) +#define R200_TXC_ARG_C_R2_ALPHA (15 << 10) +#define R200_TXC_ARG_C_R3_COLOR (16 << 10) +#define R200_TXC_ARG_C_R3_ALPHA (17 << 10) +#define R200_TXC_ARG_C_R4_COLOR (18 << 10) +#define R200_TXC_ARG_C_R4_ALPHA (19 << 10) +#define R200_TXC_ARG_C_R5_COLOR (20 << 10) +#define R200_TXC_ARG_C_R5_ALPHA (21 << 10) +#define R200_TXC_ARG_C_TFACTOR1_COLOR (26 << 10) +#define R200_TXC_ARG_C_TFACTOR1_ALPHA (27 << 10) #define R200_TXC_ARG_C_MASK (31 << 10) #define R200_TXC_ARG_C_SHIFT 10 #define R200_TXC_COMP_ARG_A (1 << 16) @@ -1173,54 +1173,54 @@ #define R200_TXA_ARG_A_TFACTOR1_BLUE (27) #define R200_TXA_ARG_A_MASK (31 << 0) #define R200_TXA_ARG_A_SHIFT 0 -#define R200_TXA_ARG_B_ZERO (0<<5) -#define R200_TXA_ARG_B_CURRENT_ALPHA (2<<5) /* guess */ -#define R200_TXA_ARG_B_CURRENT_BLUE (3<<5) /* guess */ -#define R200_TXA_ARG_B_DIFFUSE_ALPHA (4<<5) -#define R200_TXA_ARG_B_DIFFUSE_BLUE (5<<5) -#define R200_TXA_ARG_B_SPECULAR_ALPHA (6<<5) -#define R200_TXA_ARG_B_SPECULAR_BLUE (7<<5) -#define R200_TXA_ARG_B_TFACTOR_ALPHA (8<<5) -#define R200_TXA_ARG_B_TFACTOR_BLUE (9<<5) -#define R200_TXA_ARG_B_R0_ALPHA (10<<5) -#define R200_TXA_ARG_B_R0_BLUE (11<<5) -#define R200_TXA_ARG_B_R1_ALPHA (12<<5) -#define R200_TXA_ARG_B_R1_BLUE (13<<5) -#define R200_TXA_ARG_B_R2_ALPHA (14<<5) -#define R200_TXA_ARG_B_R2_BLUE (15<<5) -#define R200_TXA_ARG_B_R3_ALPHA (16<<5) -#define R200_TXA_ARG_B_R3_BLUE (17<<5) -#define R200_TXA_ARG_B_R4_ALPHA (18<<5) -#define R200_TXA_ARG_B_R4_BLUE (19<<5) -#define R200_TXA_ARG_B_R5_ALPHA (20<<5) -#define R200_TXA_ARG_B_R5_BLUE (21<<5) -#define R200_TXA_ARG_B_TFACTOR1_ALPHA (26<<5) -#define R200_TXA_ARG_B_TFACTOR1_BLUE (27<<5) +#define R200_TXA_ARG_B_ZERO (0 << 5) +#define R200_TXA_ARG_B_CURRENT_ALPHA (2 << 5) /* guess */ +#define R200_TXA_ARG_B_CURRENT_BLUE (3 << 5) /* guess */ +#define R200_TXA_ARG_B_DIFFUSE_ALPHA (4 << 5) +#define R200_TXA_ARG_B_DIFFUSE_BLUE (5 << 5) +#define R200_TXA_ARG_B_SPECULAR_ALPHA (6 << 5) +#define R200_TXA_ARG_B_SPECULAR_BLUE (7 << 5) +#define R200_TXA_ARG_B_TFACTOR_ALPHA (8 << 5) +#define R200_TXA_ARG_B_TFACTOR_BLUE (9 << 5) +#define R200_TXA_ARG_B_R0_ALPHA (10 << 5) +#define R200_TXA_ARG_B_R0_BLUE (11 << 5) +#define R200_TXA_ARG_B_R1_ALPHA (12 << 5) +#define R200_TXA_ARG_B_R1_BLUE (13 << 5) +#define R200_TXA_ARG_B_R2_ALPHA (14 << 5) +#define R200_TXA_ARG_B_R2_BLUE (15 << 5) +#define R200_TXA_ARG_B_R3_ALPHA (16 << 5) +#define R200_TXA_ARG_B_R3_BLUE (17 << 5) +#define R200_TXA_ARG_B_R4_ALPHA (18 << 5) +#define R200_TXA_ARG_B_R4_BLUE (19 << 5) +#define R200_TXA_ARG_B_R5_ALPHA (20 << 5) +#define R200_TXA_ARG_B_R5_BLUE (21 << 5) +#define R200_TXA_ARG_B_TFACTOR1_ALPHA (26 << 5) +#define R200_TXA_ARG_B_TFACTOR1_BLUE (27 << 5) #define R200_TXA_ARG_B_MASK (31 << 5) #define R200_TXA_ARG_B_SHIFT 5 -#define R200_TXA_ARG_C_ZERO (0<<10) -#define R200_TXA_ARG_C_CURRENT_ALPHA (2<<10) /* guess */ -#define R200_TXA_ARG_C_CURRENT_BLUE (3<<10) /* guess */ -#define R200_TXA_ARG_C_DIFFUSE_ALPHA (4<<10) -#define R200_TXA_ARG_C_DIFFUSE_BLUE (5<<10) -#define R200_TXA_ARG_C_SPECULAR_ALPHA (6<<10) -#define R200_TXA_ARG_C_SPECULAR_BLUE (7<<10) -#define R200_TXA_ARG_C_TFACTOR_ALPHA (8<<10) -#define R200_TXA_ARG_C_TFACTOR_BLUE (9<<10) -#define R200_TXA_ARG_C_R0_ALPHA (10<<10) -#define R200_TXA_ARG_C_R0_BLUE (11<<10) -#define R200_TXA_ARG_C_R1_ALPHA (12<<10) -#define R200_TXA_ARG_C_R1_BLUE (13<<10) -#define R200_TXA_ARG_C_R2_ALPHA (14<<10) -#define R200_TXA_ARG_C_R2_BLUE (15<<10) -#define R200_TXA_ARG_C_R3_ALPHA (16<<10) -#define R200_TXA_ARG_C_R3_BLUE (17<<10) -#define R200_TXA_ARG_C_R4_ALPHA (18<<10) -#define R200_TXA_ARG_C_R4_BLUE (19<<10) -#define R200_TXA_ARG_C_R5_ALPHA (20<<10) -#define R200_TXA_ARG_C_R5_BLUE (21<<10) -#define R200_TXA_ARG_C_TFACTOR1_ALPHA (26<<10) -#define R200_TXA_ARG_C_TFACTOR1_BLUE (27<<10) +#define R200_TXA_ARG_C_ZERO (0 << 10) +#define R200_TXA_ARG_C_CURRENT_ALPHA (2 << 10) /* guess */ +#define R200_TXA_ARG_C_CURRENT_BLUE (3 << 10) /* guess */ +#define R200_TXA_ARG_C_DIFFUSE_ALPHA (4 << 10) +#define R200_TXA_ARG_C_DIFFUSE_BLUE (5 << 10) +#define R200_TXA_ARG_C_SPECULAR_ALPHA (6 << 10) +#define R200_TXA_ARG_C_SPECULAR_BLUE (7 << 10) +#define R200_TXA_ARG_C_TFACTOR_ALPHA (8 << 10) +#define R200_TXA_ARG_C_TFACTOR_BLUE (9 << 10) +#define R200_TXA_ARG_C_R0_ALPHA (10 << 10) +#define R200_TXA_ARG_C_R0_BLUE (11 << 10) +#define R200_TXA_ARG_C_R1_ALPHA (12 << 10) +#define R200_TXA_ARG_C_R1_BLUE (13 << 10) +#define R200_TXA_ARG_C_R2_ALPHA (14 << 10) +#define R200_TXA_ARG_C_R2_BLUE (15 << 10) +#define R200_TXA_ARG_C_R3_ALPHA (16 << 10) +#define R200_TXA_ARG_C_R3_BLUE (17 << 10) +#define R200_TXA_ARG_C_R4_ALPHA (18 << 10) +#define R200_TXA_ARG_C_R4_BLUE (19 << 10) +#define R200_TXA_ARG_C_R5_ALPHA (20 << 10) +#define R200_TXA_ARG_C_R5_BLUE (21 << 10) +#define R200_TXA_ARG_C_TFACTOR1_ALPHA (26 << 10) +#define R200_TXA_ARG_C_TFACTOR1_BLUE (27 << 10) #define R200_TXA_ARG_C_MASK (31 << 10) #define R200_TXA_ARG_C_SHIFT 10 #define R200_TXA_COMP_ARG_A (1 << 16) diff -ur -N XOrg-6.8.2.orig/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h XOrg-6.8.2/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h --- XOrg-6.8.2.orig/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h 2004-12-08 08:02:46.000000000 +0100 +++ XOrg-6.8.2/xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h 2005-03-23 17:12:23.000000000 +0100 @@ -36,6 +36,7 @@ #else +#undef XFree86LOADER #define XFree86LOADER /* not really */ #define IN_LOADER @@ -44,6 +45,7 @@ #include "xf86Opt.h" #include "xf86Module.h" +#undef XINPUT #define XINPUT #include "xf86Xinput.h"