X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_out.c;h=74787e3b763f43139872ec9a4c4b700cbac8a541;hb=6bc0b37303f26faf6fbdcbbee444c227e83a329c;hp=edb0aa9c0a79a26cb23da5614b9242413c2eeaf7;hpb=a3bd6f4760b5b3f5f360a690920839646e2b9d06;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_out.c b/src/xcb_out.c index edb0aa9..74787e3 100644 --- a/src/xcb_out.c +++ b/src/xcb_out.c @@ -33,7 +33,7 @@ #include "xcb.h" #include "xcbext.h" #include "xcbint.h" -#include "extensions/bigreq.h" +#include "bigreq.h" static int write_block(xcb_connection_t *c, struct iovec *vector, int count) { @@ -163,7 +163,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG; /* get a sequence number and arrange for delivery. */ - pthread_mutex_lock(&c->iolock); + _xcb_lock_io(c); /* wait for other writing threads to get out of my way. */ while(c->out.writing) pthread_cond_wait(&c->out.cond, &c->iolock); @@ -207,7 +207,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect _xcb_conn_shutdown(c); request = 0; } - pthread_mutex_unlock(&c->iolock); + _xcb_unlock_io(c); return request; } @@ -216,9 +216,9 @@ int xcb_flush(xcb_connection_t *c) int ret; if(c->has_error) return 0; - pthread_mutex_lock(&c->iolock); + _xcb_lock_io(c); ret = _xcb_out_flush_to(c, c->out.request); - pthread_mutex_unlock(&c->iolock); + _xcb_unlock_io(c); return ret; }