summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2006-02-22 23:11:36 -0800
committerJamey Sharp <jamey@minilop.net>2006-02-22 23:11:36 -0800
commite0a35783837e0d4974cfa20c6a7a073698f3b0a5 (patch)
tree76bf9df74a0509522c3f951b0b6fabc71e48f0df
parenta7d749ec3fd3303a4e7ace9d4f0f1672f9310ef2 (diff)
Remove USE_THREAD_ASSERT compile option. _xcb_conn_wait can no longer be re-entered, since we have no callback hooks now.
-rw-r--r--src/xcb_conn.c12
1 files changed, 0 insertions, 12 deletions
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;
}