From: Jamey Sharp <jamey@minilop.net>
Date: Thu, 23 Feb 2006 07:11:36 +0000 (-0800)
Subject: Remove USE_THREAD_ASSERT compile option. _xcb_conn_wait can no longer be re-entered... 
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a35783837e0d4974cfa20c6a7a073698f3b0a5;p=free-sw%2Fxcb%2Flibxcb

Remove USE_THREAD_ASSERT compile option. _xcb_conn_wait can no longer be re-entered, since we have no callback hooks now.
---

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 0148abf..50512ee 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -182,12 +182,6 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
 {
     int ret = 1;
     fd_set rfds, wfds;
-#if USE_THREAD_ASSERT
-    static __thread int already_here = 0;
-
-    assert(!already_here);
-    ++already_here;
-#endif
 
     _xcb_assert_valid_sequence(c);
 
@@ -195,9 +189,6 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
     if(should_write ? c->out.writing : c->in.reading)
     {
         pthread_cond_wait(cond, &c->iolock);
-#if USE_THREAD_ASSERT
-        --already_here;
-#endif
         return 1;
     }
 
@@ -232,8 +223,5 @@ done:
         --c->out.writing;
     --c->in.reading;
 
-#if USE_THREAD_ASSERT
-    --already_here;
-#endif
     return ret;
 }