X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=3ab538508730a4cca7a7ce0b3ff3c0c84a3063e3;hb=9b4d6f30a339e2d18ebaea98149da81aba453216;hp=ebaa6e2a1a447cbba022c6d47ac3729d9959e0d2;hpb=20da10490f8dac75ec9fe1df28cb9e862e171be5;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index ebaa6e2..3ab5385 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -44,6 +44,7 @@
 #ifdef _WIN32
 #include "xcb_windefs.h"
 #else
+#include <sys/socket.h>
 #include <netinet/in.h>
 #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);
@@ -364,6 +367,13 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
     do {
 #if USE_POLL
         ret = poll(&fd, 1, -1);
+        /* If poll() returns an event we didn't expect, such as POLLNVAL, treat
+         * it as if it failed. */
+        if(ret >= 0 && (fd.revents & ~fd.events))
+        {
+            ret = -1;
+            break;
+        }
 #else
         ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
 #endif