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

[Jon TURNEY]

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 :-)

> Found-by: Tinderbox
> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> 
> ---
> 
> libxcb started failing to build in yuffie tinderbox just before the 1.8 release.  This is fallout from 0e9246def562be97cc816f824f702233a826ec56 which essentially just causes <X11/Xdmcp.h> to never be included under any cicrumstances.
> 
> This is a perfect example of why it's not a good idea to tag without waiting a few days.  I suspect there should be a 1.8.1 brownbag which fixes this failure and the xcb-proto dependency bug.

Having also been bitten by this in a different way, I can only agree.

> 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

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 :-)
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-Fix-build-of-xcb_auth.c-with-XDMCP-on-WIN32.patch
URL: <http://lists.freedesktop.org/archives/xcb/attachments/20120118/4f9a50cc/attachment.ksh>