X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=3ab538508730a4cca7a7ce0b3ff3c0c84a3063e3;hb=527df3c84bd71113cedc7f55089c02d1c099ecad;hp=f2a26366f3c9b8a6f7fdbd8de7d75005881efb0c;hpb=28d39258008fcc8ced84dc6c1dd2644e2c908c87;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_conn.c b/src/xcb_conn.c index f2a2636..3ab5385 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -44,6 +44,7 @@ #ifdef _WIN32 #include "xcb_windefs.h" #else +#include #include #endif /* _WIN32 */ @@ -58,7 +59,7 @@ typedef struct { uint16_t length; } xcb_setup_generic_t; -static const int error_connection = 1; +const int error_connection = 1; static int set_fd_flags(const int fd) { @@ -257,6 +258,7 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info) { xcb_connection_t* c; +#ifndef _WIN32 #ifndef USE_POLL if(fd >= FD_SETSIZE) /* would overflow in FD_SET */ { @@ -264,6 +266,7 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info) return (xcb_connection_t *) &error_connection; } #endif +#endif /* !_WIN32*/ c = calloc(1, sizeof(xcb_connection_t)); if(!c) { @@ -293,7 +296,7 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info) void xcb_disconnect(xcb_connection_t *c) { - if(c->has_error) + if(c == (xcb_connection_t *) &error_connection) return; free(c->setup);