diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-26 09:35:54 +0200 |
| commit | d47db8d4713de42ccca071c9e8401fc7a213ed49 (patch) | |
| tree | 7189b3c025315c514ae9d2835810b94d0e4e0e01 /libxcb/src/xcb_in.c | |
| parent | 880395e8c3f451bf34b96da76fcee133b356e966 (diff) | |
| parent | c30d5eefc96925b4bef781806c7a0114eca1b8e0 (diff) | |
| download | vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.gz vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.tar.bz2 vcxsrv-d47db8d4713de42ccca071c9e8401fc7a213ed49.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014
Conflicts:
openssl/Makefile
Diffstat (limited to 'libxcb/src/xcb_in.c')
| -rw-r--r-- | libxcb/src/xcb_in.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c index 559a6e3ea..dfcd1ecd8 100644 --- a/libxcb/src/xcb_in.c +++ b/libxcb/src/xcb_in.c @@ -36,9 +36,6 @@ #include <stdio.h> #include <errno.h> -#include "xcb.h" -#include "xcbext.h" -#include "xcbint.h" #if USE_POLL #include <poll.h> #endif @@ -51,6 +48,10 @@ #include "xcb_windefs.h" #endif /* _WIN32 */ +#include "xcb.h" +#include "xcbext.h" +#include "xcbint.h" + #define XCB_ERROR 0 #define XCB_REPLY 1 #define XCB_XGE_EVENT 35 |