From e0a35783837e0d4974cfa20c6a7a073698f3b0a5 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 22 Feb 2006 23:11:36 -0800 Subject: [PATCH] Remove USE_THREAD_ASSERT compile option. _xcb_conn_wait can no longer be re-entered, since we have no callback hooks now. --- src/xcb_conn.c | 12 ------------ 1 file changed, 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; } -- 2.7.4