Fix build of xcb_auth.c with XDMCP on WIN32
authorJon TURNEY <jon.turney@dronecode.org.uk>
Wed, 18 Jan 2012 14:11:07 +0000 (14:11 +0000)
committerJeremy Huddleston <jeremyhu@apple.com>
Sat, 28 Jan 2012 20:44:17 +0000 (12:44 -0800)
commit87b7bf875e0105924ae306e90ca79512d6c0cf47
tree02317666302a80acbb341b3c4bacccc57b6d3f27
parent6db1a2686f0f073438d36f5fa0f97b787842b0f2
Fix build of xcb_auth.c with XDMCP on WIN32

Fix a redefinition problem which shows up when building for _WIN32 and
libXdmcp is installed, so HASXDMAUTH is enabled

It seems this is a special place in xcb as it uses other X11 library headers here

If HASXDMAUTH is defined, include the wrapped windows.h before any header which
includes it unwrapped, to avoid conflicts with types defined in X headers

We need to include config.h and check HASXDMAUTH to avoid an unconditional dependency
on x11proto headers

In file included from install/include/X11/Xdmcp.h:19:0,
                 from git/xcb/libxcb/src/xcb_auth.c:52:
install/include/X11/Xmd.h:120:14: error: conflicting types for 'INT32'
/usr/i686-pc-mingw32/sys-root/mingw/include/basetsd.h:54:13: note: previous declaration of 'INT32' was here
install/include/X11/Xmd.h:143:15: error: conflicting types for 'BOOL'
/usr/i686-pc-mingw32/sys-root/mingw/include/windef.h:234:17: note: previous declaration of 'BOOL' was here

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
src/xcb_auth.c