X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fxcb_conn.c;h=95b5fa283b0047d9382c28b46f5b969af11db64d;hb=53971ea183d9d1dcfbaec18b135e49c9c118fabb;hp=51f8eaa819a70e37d204c58c9f5903a58124be5b;hpb=d69c403cba9bdebd1bd41b62ae7e28f5852248d4;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 51f8eaa..95b5fa2 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -169,7 +169,7 @@ static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
 
 /* Public interface */
 
-XCBConnSetupSuccessRep *XCBGetSetup(XCBConnection *c)
+const XCBConnSetupSuccessRep *XCBGetSetup(XCBConnection *c)
 {
     /* doesn't need locking because it's never written to. */
     return c->setup;
@@ -253,7 +253,11 @@ int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector
     }
 
     pthread_mutex_unlock(&c->iolock);
-    ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0;
+    do {
+	ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+    } while (ret == -1 && errno == EINTR);
+    if (ret < 0)
+	ret = 0;
     pthread_mutex_lock(&c->iolock);
 
     if(ret)