Revert "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 4a01f6f..b25f03b 100644 (file)
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -34,10 +34,6 @@
 #include "config.h"
 #endif
 
-#if HAVE_SENDMSG
-#include <sys/socket.h>
-#endif
-
 #ifdef GCC_HAS_VISIBILITY
 #pragma GCC visibility push(hidden)
 #endif
@@ -83,13 +79,10 @@ 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
 
 typedef struct _xcb_fd {
-    struct cmsghdr cmsghdr;
     int fd[XCB_MAX_PASS_FD];
     int nfd;
     int ifd;
@@ -100,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;
@@ -154,6 +148,7 @@ typedef struct _xcb_in {
 #if HAVE_SENDMSG
     _xcb_fd in_fd;
 #endif
+    struct xcb_special_event *special_events;
 } _xcb_in;
 
 int _xcb_in_init(_xcb_in *in);