diff options
| -rw-r--r-- | src/xcb.h | 2 | ||||
| -rw-r--r-- | src/xcb_auth.c | 2 | ||||
| -rw-r--r-- | src/xcb_conn.c | 6 | ||||
| -rw-r--r-- | src/xcb_in.c | 4 | ||||
| -rw-r--r-- | src/xcb_util.c | 2 | ||||
| -rw-r--r-- | src/xcb_windefs.h | 45 |
6 files changed, 53 insertions, 8 deletions
@@ -38,7 +38,7 @@ #ifndef _WIN32 #include <sys/uio.h> #else -#include "windefs.h" +#include "xcb_windefs.h" #endif #include <pthread.h> diff --git a/src/xcb_auth.c b/src/xcb_auth.c index a52f922..8fcfafd 100644 --- a/src/xcb_auth.c +++ b/src/xcb_auth.c @@ -32,7 +32,7 @@ #include <stdlib.h> #ifdef _WIN32 -#include "windefs.h" +#include "xcb_windefs.h" #else #include <sys/socket.h> #include <netinet/in.h> diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 4a50af3..870c438 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -37,12 +37,12 @@ #include "xcbint.h" #if USE_POLL #include <poll.h> -#elif !defined WIN32 +#elif !defined _WIN32 #include <sys/select.h> #endif #ifdef _WIN32 -#include "windefs.h" +#include "xcb_windefs.h" #else #include <netinet/in.h> #endif /* _WIN32 */ @@ -77,7 +77,7 @@ static int set_fd_flags(const int fd) if(fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) return 0; return 1; -#endif /* WIN32 */ +#endif /* _WIN32 */ } static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info) diff --git a/src/xcb_in.c b/src/xcb_in.c index 20ff4f2..4191dc3 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -37,12 +37,12 @@ #include "xcbint.h" #if USE_POLL #include <poll.h> -#elif !defined WIN32 +#elif !defined _WIN32 #include <sys/select.h> #endif #ifdef _WIN32 -#include "windefs.h" +#include "xcb_windefs.h" #endif /* _WIN32 */ #define XCB_ERROR 0 diff --git a/src/xcb_util.c b/src/xcb_util.c index 1848abc..882db52 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -39,7 +39,7 @@ #include <string.h> #ifdef _WIN32 -#include "windefs.h" +#include "xcb_windefs.h" #else #include <sys/socket.h> #include <sys/un.h> diff --git a/src/xcb_windefs.h b/src/xcb_windefs.h new file mode 100644 index 0000000..a7c0104 --- /dev/null +++ b/src/xcb_windefs.h @@ -0,0 +1,45 @@ +/* Copyright (C) 2009 Jatin Golani. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + + +#ifndef _WINDEFS_H +#define _WINDEFS_H + +#ifndef WINVER +#define WINVER 0x0501 /* required for getaddrinfo/freeaddrinfo defined only for WinXP and above */ +#endif + +#include <winsock2.h> +#include <ws2tcpip.h> +#include <windef.h> + +struct iovec { + void *iov_base; /* Pointer to data. */ + int iov_len; /* Length of data. */ +}; + +typedef unsigned int in_addr_t; + +#endif /* windefs.h */ |