diff options
| author | Peter Harris <pharris@opentext.com> | 2010-08-31 18:33:36 -0400 |
|---|---|---|
| committer | Peter Harris <pharris@opentext.com> | 2010-08-31 18:35:20 -0400 |
| commit | 20da10490f8dac75ec9fe1df28cb9e862e171be5 (patch) | |
| tree | 0a0f1f384ad8cb461bb5aa9eb1402de086113ac3 /src/xcb_auth.c | |
| parent | 7f5cfcc2fd0168d505504cc088bfdcba5c71f0ea (diff) | |
| parent | 2dcf8b025be88a25d4333abdc28d425b88238d96 (diff) | |
Merge branch 'master' of git://github.com/topcat/xcb-win32
Conflicts:
src/xcb_conn.c
src/xcb_util.c
Signed-off-by: Peter Harris <pharris@opentext.com>
Diffstat (limited to 'src/xcb_auth.c')
| -rw-r--r-- | src/xcb_auth.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/xcb_auth.c b/src/xcb_auth.c index d774d10..1af27fc 100644 --- a/src/xcb_auth.c +++ b/src/xcb_auth.c @@ -27,13 +27,18 @@ #include <assert.h> #include <X11/Xauth.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <sys/un.h> #include <sys/param.h> #include <unistd.h> #include <stdlib.h> +#ifdef _WIN32 +#include "xcb_windefs.h" +#else +#include <sys/socket.h> +#include <netinet/in.h> +#include <sys/un.h> +#endif /* _WIN32 */ + #include "xcb.h" #include "xcbint.h" |