Another compile failure (xserver)?

[Nigel Cunningham]

Hi all.

Is anyone else getting this? I got the previous error with autoconf
(DMX_BUILD_USB does not appear in AM_CONDITIONAL etc), but having
progressed beyond that, I'm now getting:

gcc -DHAVE_CONFIG_H -I. -I../../include    -DHAVE_DIX_CONFIG_H
-DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS  -DHAVE_DIX_CONFIG_H -Wall
-Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing
-D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
-DDBUS_API_SUBJECT_TO_CHANGE -I/xorg/usr/include
-I/xorg/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/hal
-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include     -I../../include
-I../../include -I../../Xext -I../../composite -I../../damageext
-I../../xfixes -I../../Xi -I../../mi -I../../miext/shadow
-I../../miext/damage -I../../render -I../../randr -I../../fb -g -O2 -MT
dpmsstubs.o -MD -MP -MF .deps/dpmsstubs.Tpo -c -o dpmsstubs.o `test -f
'../../Xext/dpmsstubs.c' || echo './'`../../Xext/dpmsstubs.c
In file included from ../../include/gc.h:53,
                 from ../../include/dix.h:52,
                 from ../../include/dixstruct.h:28,
                 from ../../Xext/dpmsproc.h:12,
                 from ../../Xext/dpmsstubs.c:36:
/xorg/usr/include/X11/Xdefs.h:49: error: redefinition of typedef 'Bool'
../../Xext/dpmsstubs.c:29: error: previous declaration of 'Bool' was here
make[3]: *** [dpmsstubs.o] Error 1
make[3]: Leaving directory `/home/nigel/Programming/xorg/xserver/hw/vfb'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/home/nigel/Programming/xorg/xserver/hw/vfb'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/nigel/Programming/xorg/xserver/hw'
make: *** [all-recursive] Error 1


Xdefs.h:

#ifndef Bool
#  ifndef _XTYPEDEF_BOOL
#   define _XTYPEDEF_BOOL
typedef int Bool;
#  endif
#endif

dpmsstubs.c:
(Unconditional)
typedef int Bool;

Commenting out this last declaration makes it compile.

Nigel