diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-10 16:51:24 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-10 16:51:24 -0700 |
| commit | fd82552d5c0ce1931f29006a0c36f5e03cf8577e (patch) | |
| tree | cad7da601336e6706cdb41267bef9d3205a84175 /src/XlibInt.c | |
| parent | aae2a4a7aab26de3fa715d6ecd0a0e0926b37fc9 (diff) | |
| parent | 933aee1d5c53b0cc7d608011a29188b594c8d70b (diff) | |
| download | xorg-lib-libX11-fd82552d5c0ce1931f29006a0c36f5e03cf8577e.tar.gz | |
Merge branch 'xlib-xcb-thread-fixes'
Diffstat (limited to 'src/XlibInt.c')
| -rw-r--r-- | src/XlibInt.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/XlibInt.c b/src/XlibInt.c index 13e65087..955cd079 100644 --- a/src/XlibInt.c +++ b/src/XlibInt.c @@ -86,14 +86,6 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; (*(d)->lock->push_reader)(d,&(d)->lock->reply_awaiters_tail) : NULL) #define QueueEventReaderLock(d) ((d)->lock ? \ (*(d)->lock->push_reader)(d,&(d)->lock->event_awaiters_tail) : NULL) - -#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) -#define InternalLockDisplay(d,wskip) if ((d)->lock) \ - (*(d)->lock->internal_lock_display)(d,wskip,__FILE__,__LINE__) -#else -#define InternalLockDisplay(d,wskip) if ((d)->lock) \ - (*(d)->lock->internal_lock_display)(d,wskip) -#endif #endif /* !USE_XCB */ #else /* XTHREADS else */ @@ -101,7 +93,6 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; #if !USE_XCB #define UnlockNextReplyReader(d) #define UnlockNextEventReader(d) -#define InternalLockDisplay(d,wskip) #endif /* !USE_XCB */ #endif /* XTHREADS else */ @@ -575,7 +566,7 @@ void sync_while_locked(Display *dpy) #endif UnlockDisplay(dpy); SyncHandle(); - LockDisplay(dpy); + InternalLockDisplay(dpy, /* don't skip user locks */ 0); #ifdef XTHREADS if (dpy->lock) (*dpy->lock->user_unlock_display)(dpy); |