diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-19 07:53:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-19 07:53:39 +0100 |
| commit | f75616ac3e99a6bb814803c823cb34533b9fc328 (patch) | |
| tree | 83e9fff2bbf6c94df686a938d00858e0a06adcf0 /libxcb/src/xcbint.h | |
| parent | cb043e6091c966fa8b772ec86fbc026ddcac9d87 (diff) | |
| parent | 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 (diff) | |
| download | vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.tar.gz vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.tar.bz2 vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xcb-proto xserver mesa git update 19 nov 2013
Diffstat (limited to 'libxcb/src/xcbint.h')
| -rw-r--r-- | libxcb/src/xcbint.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libxcb/src/xcbint.h b/libxcb/src/xcbint.h index 5c904fbb7..b25f03b3e 100644 --- a/libxcb/src/xcbint.h +++ b/libxcb/src/xcbint.h @@ -79,8 +79,6 @@ void *_xcb_map_remove(_xcb_map *q, unsigned int key); /* xcb_out.c */ -typedef void (*xcb_return_socket_func_t)(void *closure); - #if HAVE_SENDMSG #define XCB_MAX_PASS_FD 16 @@ -95,9 +93,10 @@ typedef struct _xcb_out { pthread_cond_t cond; int writing; - xcb_return_socket_func_t return_socket; + pthread_cond_t socket_cond; + void (*return_socket)(void *closure); void *socket_closure; - unsigned int socket_seq; + int socket_moving; char queue[XCB_QUEUE_BUFFER_SIZE]; int queue_len; |