From 3e85e2f1e33380d6c9efe0972ed475cbf9dbe825 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 13 Jan 2012 17:27:26 +0100 Subject: Solved compile errors --- libxcb/src/xcb_auth.c | 2 -- libxcb/src/xcb_util.c | 4 +--- libxcb/src/xcb_windefs.h | 2 ++ 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 #include #include -#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 #include #include -#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 #include +typedef unsigned char BYTE; + typedef unsigned int in_addr_t; #define HANDLE void * -- cgit v1.2.3