aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-13 17:27:26 +0100
committermarha <marha@users.sourceforge.net>2012-01-13 17:27:26 +0100
commit3e85e2f1e33380d6c9efe0972ed475cbf9dbe825 (patch)
tree41a3f6f187cde886a272a913693f685db71007b1
parente2e1bdced7e09e39fed613dae1f2f3096cb18118 (diff)
downloadvcxsrv-3e85e2f1e33380d6c9efe0972ed475cbf9dbe825.tar.gz
vcxsrv-3e85e2f1e33380d6c9efe0972ed475cbf9dbe825.tar.bz2
vcxsrv-3e85e2f1e33380d6c9efe0972ed475cbf9dbe825.zip
Solved compile errors
-rw-r--r--libxcb/src/xcb_auth.c2
-rw-r--r--libxcb/src/xcb_util.c4
-rw-r--r--libxcb/src/xcb_windefs.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c
index ec1d2027a..eaf463cb2 100644
--- a/libxcb/src/xcb_auth.c
+++ b/libxcb/src/xcb_auth.c
@@ -30,8 +30,6 @@
#include <sys/param.h>
#include <unistd.h>
#include <stdlib.h>
-#ifndef _MSC_VER
-#endif
#ifdef __INTERIX
/* _don't_ ask. interix has INADDR_LOOPBACK in here. */
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c
index 645d083e4..f406b0158 100644
--- a/libxcb/src/xcb_util.c
+++ b/libxcb/src/xcb_util.c
@@ -34,8 +34,6 @@
#include <stddef.h>
#include <unistd.h>
#include <string.h>
-#ifndef _MSC_VER
-#endif
#ifdef _WIN32
#include "xcb_windefs.h"
@@ -461,7 +459,7 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
#ifdef _WIN32
WSADATA wsaData;
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
- c = (xcb_connection_t *) &error_connection;
+ c = _xcb_conn_ret_error(XCB_CONN_ERROR);
goto out;
}
#endif
diff --git a/libxcb/src/xcb_windefs.h b/libxcb/src/xcb_windefs.h
index 5b3493d1a..9789735f2 100644
--- a/libxcb/src/xcb_windefs.h
+++ b/libxcb/src/xcb_windefs.h
@@ -40,6 +40,8 @@
#include <ws2tcpip.h>
#include <windef.h>
+typedef unsigned char BYTE;
+
typedef unsigned int in_addr_t;
#define HANDLE void *