diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
| commit | 82967ab5e087a2fdfcb984f990ba117da68a5b60 (patch) | |
| tree | 52ca72e09a0d1d0ecacfb51a8b0b5d1c8193449c /libxcb/src/xcb_util.c | |
| parent | f02db4f3b9d748e1fd06e3ae2985b9cf1547cc7e (diff) | |
| parent | 67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff) | |
| download | vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.gz vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.bz2 vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released
Diffstat (limited to 'libxcb/src/xcb_util.c')
| -rw-r--r-- | libxcb/src/xcb_util.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c index 577ec3da9..55aadb7ca 100644 --- a/libxcb/src/xcb_util.c +++ b/libxcb/src/xcb_util.c @@ -26,10 +26,6 @@ /* Utility functions implementable using only public APIs. */ #include <assert.h> -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#ifndef _MSC_VER #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> @@ -40,31 +36,17 @@ #include <netdnet/dn.h> #endif #include <netdb.h> +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> #include <stddef.h> #include <unistd.h> - -#else -#include <X11/Xwinsock.h> -#include <X11\Xos.h> -#define snprintf _snprintf -#define HAVE_GETADDRINFO -#endif - #include <string.h> #include "xcb.h" #include "xcbext.h" #include "xcbint.h" -#ifndef HAVE_GETADDRINFO -#include "dummyin6.h" -#include "getaddrinfo.h" -#else -#ifdef _MSC_VER -#include <Ws2tcpip.h> -#endif -#endif - static const int error_connection = 1; int xcb_popcount(uint32_t mask) |