help diagnosing latest git xserver build failure

[rglowery at exemail.com.au]

I'm trying to build the latest git xserver to see if it crashes when I do
a "xrandr --output TV --set TV_FORMAT 576p --auto" while no monitor is
connected like xserver 1.3 does, but have run into the following build
issue.

 gcc -DHAVE_CONFIG_H -I. -I../include -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 -I/opt/xorg/include
-I/opt/xorg/include/pixman-1 -I/usr/include/freetype2 -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 getselev.lo -MD -MP -MF .deps/getselev.Tpo -c
getselev.c  -fPIC -DPIC -o .libs/getselev.o
In file included from getselev.c:59:
/usr/include/X11/extensions/XI.h:270: error: expected '=', ',', ';', 'asm'
or '__attribute__' before 'XEventClass'
In file included from getselev.c:67:
getprop.h:39: error: expected '=', ',', ';', 'asm' or '__attribute__'
before '*' token
getselev.c: In function 'ProcXGetSelectedExtensionEvents':
getselev.c:101: error: 'XEventClass' undeclared (first use in this function)
getselev.c:101: error: (Each undeclared identifier is reported only once
getselev.c:101: error: for each function it appears in.)
getselev.c:101: error: 'buf' undeclared (first use in this function)
getselev.c:102: error: 'tclient' undeclared (first use in this function)
getselev.c:103: error: 'aclient' undeclared (first use in this function)
getselev.c:124: warning: implicit declaration of function 'ClassFromMask'
getselev.c:124: warning: nested extern declaration of 'ClassFromMask'
getselev.c:138: error: expected expression before ')' token
make[1]: *** [getselev.lo] Error 1
make[1]: Leaving directory `/home/rlowery/xserver/Xi'
make: *** [all-recursive] Error 1


In this case, XEventClass is a CARD32 as I building on a 64 bit platform.
#ifdef _XSERVER64
typedef CARD32          XEventClass; //line 270 of XI.h
#else
typedef unsigned long   XEventClass;
#endif

The only header included before XI.h in getselev.c is dix-config.h which
does not define CARD32.

How do I fix this build issue?

Thanks

-Rob