X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fxcbint.h;h=7f9ab2838122368f3382961fe182f1f2ab059d15;hb=a1e67b141a57d39cbcaff1a703d6fc0da1fbb56d;hp=95f078a094b63c9cef22c3c674666616a94a9889;hpb=2415c11dec5e5adb0c17f98aa52fbb371a4f8f23;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcbint.h b/src/xcbint.h
index 95f078a..7f9ab28 100644
--- 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 */
 
+typedef void (*xcb_return_socket_func_t)(void *closure);
+
 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;
-    int socket_moving;
+    unsigned int socket_seq;
 
     char queue[XCB_QUEUE_BUFFER_SIZE];
     int queue_len;
@@ -121,7 +122,6 @@ typedef struct _xcb_in {
 
     uint64_t request_expected;
     uint64_t request_read;
-    uint64_t event_responses_completed;
     uint64_t request_completed;
     struct reply_list *current_reply;
     struct reply_list **current_reply_tail;
@@ -130,7 +130,6 @@ typedef struct _xcb_in {
     struct event_list *events;
     struct event_list **events_tail;
     struct reader_list *readers;
-    struct reader_list *event_readers;
 
     struct pending_reply *pending_replies;
     struct pending_reply **pending_replies_tail;
@@ -176,8 +175,6 @@ void _xcb_ext_destroy(xcb_connection_t *c);
 
 /* xcb_conn.c */
 
-extern const int error_connection;
-
 struct xcb_connection_t {
     int has_error;
 
@@ -195,7 +192,10 @@ struct xcb_connection_t {
     _xcb_xid xid;
 };
 
-void _xcb_conn_shutdown(xcb_connection_t *c);
+void _xcb_conn_shutdown(xcb_connection_t *c, int err);
+
+xcb_connection_t *_xcb_conn_ret_error(int err);
+
 int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count);