diff options
Diffstat (limited to 'abs/core/libxcb')
-rw-r--r-- | abs/core/libxcb/libxcb-1.1-sloppy-lock.patch | 12 | ||||
-rw-r--r-- | abs/core/libxcb/xcb_xlib-no-assert-on-lock.patch | 30 |
2 files changed, 0 insertions, 42 deletions
diff --git a/abs/core/libxcb/libxcb-1.1-sloppy-lock.patch b/abs/core/libxcb/libxcb-1.1-sloppy-lock.patch deleted file mode 100644 index 130890e..0000000 --- a/abs/core/libxcb/libxcb-1.1-sloppy-lock.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libxcb-1.1/src/xcb_conn.c.jx libxcb-1.1/src/xcb_conn.c ---- libxcb-1.1/src/xcb_conn.c.jx 2007-10-28 16:11:18.000000000 -0400 -+++ libxcb-1.1/src/xcb_conn.c 2008-04-22 11:58:05.000000000 -0400 -@@ -63,7 +63,7 @@ static int _xcb_xlib_init(_xcb_xlib *xli - { - xlib->lock = 0; - #ifndef NDEBUG -- xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0); -+ xlib->sloppy_lock = 1; - #endif - pthread_cond_init(&xlib->cond, 0); - return 1; diff --git a/abs/core/libxcb/xcb_xlib-no-assert-on-lock.patch b/abs/core/libxcb/xcb_xlib-no-assert-on-lock.patch deleted file mode 100644 index a29361b..0000000 --- a/abs/core/libxcb/xcb_xlib-no-assert-on-lock.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- src/xcb_xlib.c.orig 2006-11-25 22:03:30.000000000 +0000 -+++ src/xcb_xlib.c 2006-11-25 22:19:28.000000000 +0000 -@@ -38,18 +38,20 @@ - void xcb_xlib_lock(xcb_connection_t *c) - { - _xcb_lock_io(c); -- assert(!c->xlib.lock); -- c->xlib.lock = 1; -- c->xlib.thread = pthread_self(); -+ if (!c->xlib.lock) { -+ c->xlib.lock = 1; -+ c->xlib.thread = pthread_self(); -+ } - _xcb_unlock_io(c); - } - - void xcb_xlib_unlock(xcb_connection_t *c) - { - _xcb_lock_io(c); -- assert(c->xlib.lock); -- assert(pthread_equal(c->xlib.thread, pthread_self())); -- c->xlib.lock = 0; -- pthread_cond_broadcast(&c->xlib.cond); -+ if (c->xlib.lock) { -+ assert(pthread_equal(c->xlib.thread, pthread_self())); -+ c->xlib.lock = 0; -+ pthread_cond_broadcast(&c->xlib.cond); -+ } - _xcb_unlock_io(c); - } |