Remove USE_THREAD_ASSERT compile option. _xcb_conn_wait can no longer be re-entered, since we have no callback hooks now.
This commit is contained in:
parent
a7d749ec3f
commit
e0a3578383
|
@ -182,12 +182,6 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
|
||||||
{
|
{
|
||||||
int ret = 1;
|
int ret = 1;
|
||||||
fd_set rfds, wfds;
|
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);
|
_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)
|
if(should_write ? c->out.writing : c->in.reading)
|
||||||
{
|
{
|
||||||
pthread_cond_wait(cond, &c->iolock);
|
pthread_cond_wait(cond, &c->iolock);
|
||||||
#if USE_THREAD_ASSERT
|
|
||||||
--already_here;
|
|
||||||
#endif
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -232,8 +223,5 @@ done:
|
||||||
--c->out.writing;
|
--c->out.writing;
|
||||||
--c->in.reading;
|
--c->in.reading;
|
||||||
|
|
||||||
#if USE_THREAD_ASSERT
|
|
||||||
--already_here;
|
|
||||||
#endif
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue