[Xcb] [PATCH] Revert "Fix include order with Xdmcp on WIN32"

[Jeremy Huddleston]

On Jan 18, 2012, at 07:13, Jon TURNEY wrote:

> On 18/01/2012 07:55, Jeremy Huddleston wrote:
>> 
>> This reverts commit 0e9246def562be97cc816f824f702233a826ec56.
>> 
>> This change caused build failures because <X11/Xdmcp.h> was never
>> included under any circumstance.  This is because the check for
>> HASXDMAUTH was moved before the inclusion of config.h (via xcbint.h)
>> which defined it.
> 
> I'm impressed that you are able to turn on -Werror in your tinderbox :-)

I don't turn on -Werror.  I use -Werror=... for dangerous warnings (such as this one).

>> I don't know what you were trying to fix with this commit, since I don't have access to Windows, but this was not the right fix.
> 
> Yes, you are quite right, this fix is totally wrong and should be reverted :-(
> 
> The problem that this patch is trying to fix is that some headers in
> include/X11/ (which xcb_auth.c seems to be unique in xcb in trying to use)
> define types with names which clash with types defined in Windows system headers

Yeah, I run into that on XQuartz.  I do some crazy hacks to deal with it like:

// QuickDraw in ApplicationServices has the following conflicts with
// the basic X server headers. Use QD_<name> to use the QuickDraw
// definition of any of these symbols, or the normal name for the
// X11 definition.
#define Cursor       QD_Cursor
#define WindowPtr    QD_WindowPtr
#define Picture      QD_Picture
#define BOOL         OSX_BOOL
#define EventType    HIT_EventType

#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>

#undef Cursor
#undef WindowPtr
#undef Picture
#undef BOOL
#undef EventType

=/

> Attached is another attempt, to be applied on top of the reversion patch.
> I've actually included the build error in the comment this time :-)
> <0001-Fix-build-of-xcb_auth.c-with-XDMCP-on-WIN32.patch>

Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>