[Xcb-commit] src

[Josh Triplett]

 src/xcb_conn.c |    4 ++--
 src/xcb_util.c |    2 --
 src/xcbint.h   |    2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1c4717de367fe3bf1cf56bd8ef2bd30586bed023
Author: Josh Triplett <josh at joshtriplett.org>
Date:   Sun Sep 19 20:38:06 2010 +0200

    Allow disconnecting connections that are in error state.
    
    In support of this, consolidate the two static error_connection
    definitions into one so we don't try to free the static out-of-memory
    error_connection.
    
    Commit by Josh Triplett and Jamey Sharp.
    
    Signed-off-by: Josh Triplett <josh at joshtriplett.org>
    Signed-off-by: Jamey Sharp <jamey at minilop.net>

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index f2a2636..35b9996 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -58,7 +58,7 @@ typedef struct {
     uint16_t length;
 } xcb_setup_generic_t;
 
-static const int error_connection = 1;
+const int error_connection = 1;
 
 static int set_fd_flags(const int fd)
 {
@@ -293,7 +293,7 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
 
 void xcb_disconnect(xcb_connection_t *c)
 {
-    if(c->has_error)
+    if(c == (xcb_connection_t *) &error_connection)
         return;
 
     free(c->setup);
diff --git a/src/xcb_util.c b/src/xcb_util.c
index 0e3728a..63ea751 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -54,8 +54,6 @@
 #include "xcbext.h"
 #include "xcbint.h"
 
-static const int error_connection = 1;
-
 int xcb_popcount(uint32_t mask)
 {
     uint32_t y;
diff --git a/src/xcbint.h b/src/xcbint.h
index f07add8..6991238 100644
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -174,6 +174,8 @@ void _xcb_ext_destroy(xcb_connection_t *c);
 
 /* xcb_conn.c */
 
+extern const int error_connection;
+
 struct xcb_connection_t {
     int has_error;