projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix deadlock with xcb_take_socket/return_socket v3
[free-sw/xcb/libxcb]
/
src
/
xcbint.h
diff --git
a/src/xcbint.h
b/src/xcbint.h
index
f9e5a52
..
7f9ab28
100644
(file)
--- a/
src/xcbint.h
+++ b/
src/xcbint.h
@@
-79,14
+79,15
@@
void *_xcb_map_remove(_xcb_map *q, unsigned int key);
/* xcb_out.c */
/* xcb_out.c */
+typedef void (*xcb_return_socket_func_t)(void *closure);
+
typedef struct _xcb_out {
pthread_cond_t cond;
int writing;
typedef struct _xcb_out {
pthread_cond_t cond;
int writing;
- pthread_cond_t socket_cond;
- void (*return_socket)(void *closure);
+ xcb_return_socket_func_t return_socket;
void *socket_closure;
void *socket_closure;
-
int socket_moving
;
+
unsigned int socket_seq
;
char queue[XCB_QUEUE_BUFFER_SIZE];
int queue_len;
char queue[XCB_QUEUE_BUFFER_SIZE];
int queue_len;