projects
/
free-sw
/
xcb
/
libxcb
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7d749e
)
Remove USE_THREAD_ASSERT compile option. _xcb_conn_wait can no longer be re-entered...
author
Jamey Sharp
<jamey@minilop.net>
Thu, 23 Feb 2006 07:11:36 +0000
(23:11 -0800)
committer
Jamey Sharp
<jamey@minilop.net>
Thu, 23 Feb 2006 07:11:36 +0000
(23:11 -0800)
src/xcb_conn.c
patch
|
blob
|
history
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
0148abf
..
50512ee
100644
(file)
--- 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;
}