diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-30 08:52:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-30 08:52:35 +0100 |
| commit | c7a181e449c6a2ea5f0ad0514865e7c559dbe6dc (patch) | |
| tree | 34dcc3a6ee1d1ca9c56b60fe1a3d79424d93c654 /libxcb | |
| parent | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (diff) | |
| download | vcxsrv-c7a181e449c6a2ea5f0ad0514865e7c559dbe6dc.tar.gz vcxsrv-c7a181e449c6a2ea5f0ad0514865e7c559dbe6dc.tar.bz2 vcxsrv-c7a181e449c6a2ea5f0ad0514865e7c559dbe6dc.zip | |
libxcb mesa git update 30 jan 2012
Diffstat (limited to 'libxcb')
| -rw-r--r-- | libxcb/src/xcb_auth.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c index ea4ad8f6a..a5b730c0c 100644 --- a/libxcb/src/xcb_auth.c +++ b/libxcb/src/xcb_auth.c @@ -25,6 +25,10 @@ /* Authorization systems for the X protocol. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <assert.h> #include <X11/Xauth.h> #include <sys/param.h> @@ -36,11 +40,12 @@ #include <rpc/types.h> #endif +#ifdef _WIN32 #ifdef HASXDMAUTH -#include <X11/Xdmcp.h> +/* We must include the wrapped windows.h before any system header which includes + it unwrapped, to avoid conflicts with types defined in X headers */ +#include <X11/Xwindows.h> #endif - -#ifdef _WIN32 #include "xcb_windefs.h" #else #include <arpa/inet.h> @@ -52,6 +57,9 @@ #include "xcb.h" #include "xcbint.h" +#ifdef HASXDMAUTH +#include <X11/Xdmcp.h> +#endif enum auth_protos { #ifdef HASXDMAUTH |