Xorg/XGL compilation problem

[Sarangan Thuraisingham]

Hi all,
  I am trying to compile XGL, but my make fails with the following error.
In file included from fb.h:42,
                 from fb24_32.c:31:
../render/picturestr.h:301: error: expected declaration specifiers or
'...' before 'xTrap'
../render/picturestr.h:640: error: expected declaration specifiers or
'...' before 'xTrap'

 The full error:
make[1]: Entering directory
`/.automount/liberator/disk/export/1/src/XGL_CVS/xserver/fb'
if /bin/sh ../libtool --mode=compile --tag=CC ccache gcc
-DHAVE_CONFIG_H -I. -I. -I../include -I../include -I../include
-I../include -I../include -I../include -I../include -I../include
-I../hw/xfree86/os-support -I../hw/xfree86/os-support/bus
-I../hw/xfree86/common  -I/usr/cslib/build/include
-DHAVE_DIX_CONFIG_H -DUSE_MMX -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN
-DHAS_STICKY_DIR_BIT -I/usr/cslib/build/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 -O3 -march=pentium-m -mtune=pentium-m -pipe
-fomit-frame-pointer -ffast-math -MT libfb_la-fb24_32.lo -MD -MP -MF
".deps/libfb_la-fb24_32.Tpo" -c -o libfb_la-fb24_32.lo `test -f
'fb24_32.c' || echo './'`fb24_32.c; \
then mv -f ".deps/libfb_la-fb24_32.Tpo" ".deps/libfb_la-fb24_32.Plo";
else rm -f ".deps/libfb_la-fb24_32.Tpo"; exit 1; fi
 ccache gcc -DHAVE_CONFIG_H -I. -I. -I../include -I../include
-I../include -I../include -I../include -I../include -I../include
-I../include -I../hw/xfree86/os-support -I../hw/xfree86/os-support/bus
-I../hw/xfree86/common -I/usr/cslib/build/include -DHAVE_DIX_CONFIG_H
-DUSE_MMX -Wall -Wpointer-arith -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs
-fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT
-I/usr/cslib/build/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 -O3
-march=pentium-m -mtune=pentium-m -pipe -fomit-frame-pointer
-ffast-math -MT libfb_la-fb24_32.lo -MD -MP -MF
.deps/libfb_la-fb24_32.Tpo -c fb24_32.c  -fPIC -DPIC -o
.libs/libfb_la-fb24_32.o
In file included from fb.h:42,
                 from fb24_32.c:31:
../render/picturestr.h:301: error: expected declaration specifiers or
'...' before 'xTrap'
../render/picturestr.h:640: error: expected declaration specifiers or
'...' before 'xTrap'
make[1]: *** [libfb_la-fb24_32.lo] Error 1
make[1]: Leaving directory
`/.automount/liberator/disk/export/1/src/XGL_CVS/xserver/fb'
make: *** [all-recursive] Error 1


I searched for all occurences of xTrap in the xserver dir and its subdirs:
and its found in the following files:

fb/fbpict.h:597:            xTrap       *traps);
fb/fbtrap.c:43:     xTrap       *traps)
hw/xgl/xgl.h:837:                   xTrap          *pTrap,
hw/xgl/xgl.h:1428:           xTrap      *traps);
hw/xgl/xglgeometry.c:577:                   xTrap          *pTrap,
hw/xgl/xgltrap.c:393:        xTrap      *traps)
hw/xgl/xgltrap.c:419:   xTrap                 *pTrap = traps;
render/render.c:1873:             ntraps, (xTrap *) &stuff[1]);
render/picturestr.h:301:
xTrap          *traps);
render/picturestr.h:640:          xTrap         *traps);
render/picture.c:1913:    xTrap         *traps)

Am I missing an include file that defines 'xTrap' or could I replace
all occurences of 'xTrap' with 'xTrapezoid'

Also this is how I ran the autogen.sh script:

PKG_CONFIG_PATH=/usr/cslib/build/opt/Xgl/lib/pkgconfig ./autogen.sh
--enable-xgl --disable-xorg --disable-xprint --enable-glx --enable-dri
--with-mesa-source=/usr/cslib/src/XGL_CVS/Mesa --with-release-snap=1
--disable-xvfb --disable-xnest --enable-xglx --enable-xkb
--disable-kdriveserver --prefix=/usr/cslib/build/opt/Xgl CC="ccache
gcc" CXX="ccache g++"

Thanks in advance.

--
 Saru
ECS, University of Southampton, UK