Building current CVS tree problem

[Alan Hourihane]

I'm building the latest XFree86 CVS tree with the current cygwin tools (done by
using all the latest stuff with the setup.exe routine).

So, 

gcc reports 2.95.3-2 (cygwin special)

Everything compiles except for ddx part of the tree - 
xc/programs/Xserver/hw/xwin.

It fails when compiling the first file - InitInput.c (error below)....

I notice that winms.h is meant to undef these things that it's complaining
about, so something is redefining it. Has anyone else seen this ?

Thanks.

Alan.

In file included from /usr/include/w32api/windows.h:105,
                 from winms.h:55,
                 from win.h:164,
                 from InitInput.c:27:
/usr/include/w32api/winuser.h:494: warning: `RT_CURSOR' redefined
../../../../programs/Xserver/include/resource.h:78: warning: this is the location of the previous definition
/usr/include/w32api/winuser.h:501: warning: `RT_FONT' redefined
../../../../programs/Xserver/include/resource.h:77: warning: this is the location of the previous definition
In file included from /usr/include/w32api/windows.h:96,
                 from winms.h:55,
                 from win.h:164,
                 from InitInput.c:27:
/usr/include/w32api/windef.h:124: conflicting types for `CARD8'
../../../../exports/include/X11/Xmd.h:144: previous declaration of `CARD8'
/usr/include/w32api/windef.h:129: conflicting types for `CARD8'
/usr/include/w32api/windef.h:124: previous declaration of `CARD8'
In file included from /usr/include/w32api/winnt.h:130,
                 from /usr/include/w32api/windef.h:143,
                 from /usr/include/w32api/windows.h:96,
                 from winms.h:55,
                 from win.h:164,
                 from InitInput.c:27:
/usr/include/w32api/basetsd.h:7: conflicting types for `INT32'
../../../../exports/include/X11/Xmd.h:126: previous declaration of `INT32'
In file included from /usr/include/w32api/windows.h:96,
                 from winms.h:55,
                 from win.h:164,
                 from InitInput.c:27:
/usr/include/w32api/windef.h:152: conflicting types for `ATOM'
../../../../programs/Xserver/include/misc.h:102: previous declaration of `ATOM'
In file included from /usr/include/w32api/windows.h:100,
                 from winms.h:55,
                 from win.h:164,
                 from InitInput.c:27:
/usr/include/w32api/winbase.h:1117: conflicting types for `FreeResource'
../../../../programs/Xserver/include/resource.h:186: previous declaration of `FreeResource'
make: *** [InitInput.o] Error 1