aboutsummaryrefslogtreecommitdiff
path: root/libxcb/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-24 16:26:20 +0000
committermarha <marha@users.sourceforge.net>2009-09-24 16:26:20 +0000
commit82967ab5e087a2fdfcb984f990ba117da68a5b60 (patch)
tree52ca72e09a0d1d0ecacfb51a8b0b5d1c8193449c /libxcb/src
parentf02db4f3b9d748e1fd06e3ae2985b9cf1547cc7e (diff)
parent67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff)
downloadvcxsrv-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')
-rw-r--r--libxcb/src/dummyin6.h5
-rw-r--r--libxcb/src/xcb_auth.c13
-rw-r--r--libxcb/src/xcb_conn.c2
-rw-r--r--libxcb/src/xcb_in.c2
-rw-r--r--libxcb/src/xcb_util.c24
5 files changed, 5 insertions, 41 deletions
diff --git a/libxcb/src/dummyin6.h b/libxcb/src/dummyin6.h
index 90e879baf..b86b250e4 100644
--- a/libxcb/src/dummyin6.h
+++ b/libxcb/src/dummyin6.h
@@ -35,14 +35,9 @@
#include <sys/types.h>
-#ifndef _MSC_VER
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
-#else
-typedef unsigned short sa_family_t;
-typedef unsigned short in_port_t;
-#endif
#ifndef AF_INET6
#define AF_INET6 (AF_INET + 1)
diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c
index c0ad90267..104f2f07b 100644
--- a/libxcb/src/xcb_auth.c
+++ b/libxcb/src/xcb_auth.c
@@ -27,19 +27,12 @@
#include <assert.h>
#include <X11/Xauth.h>
-#include <X11/Xwinsock.h>
-#include <stdlib.h>
-#ifndef _MSC_VER
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/un.h>
#include <sys/param.h>
#include <unistd.h>
-#else
-typedef unsigned in_addr_t;
-#define MAXPATHLEN 255
-#define snprintf _snprintf
-#endif
+#include <stdlib.h>
#include "xcb.h"
#include "xcbint.h"
@@ -48,10 +41,6 @@ typedef unsigned in_addr_t;
#include <X11/Xdmcp.h>
#endif
-#ifndef HAVE_GETADDRINFO
-#include "dummyin6.h"
-#endif
-
enum auth_protos {
#ifdef HASXDMAUTH
AUTH_XA1,
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c
index 72b23c008..4a8f63bcf 100644
--- a/libxcb/src/xcb_conn.c
+++ b/libxcb/src/xcb_conn.c
@@ -28,8 +28,8 @@
#include <assert.h>
#include <string.h>
#include <stdio.h>
-#include <stdlib.h>
#include <unistd.h>
+#include <stdlib.h>
#ifdef _MSC_VER
#include <X11/Xwinsock.h>
#define STDERR_FILENO stderr
diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c
index 9d893ae64..0e55dc42e 100644
--- a/libxcb/src/xcb_in.c
+++ b/libxcb/src/xcb_in.c
@@ -38,13 +38,11 @@
#include "xcb.h"
#include "xcbext.h"
#include "xcbint.h"
-#ifndef _MSC_VER
#if USE_POLL
#include <poll.h>
#else
#include <sys/select.h>
#endif
-#endif
#define XCB_ERROR 0
#define XCB_REPLY 1
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)