From 4875a15ca61358a1c95b156b2279fce092451278 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 19 Jan 2022 00:45:43 +0100 Subject: Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78 --- nx-X11/lib/src/locking.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'nx-X11/lib/src/locking.h') diff --git a/nx-X11/lib/src/locking.h b/nx-X11/lib/src/locking.h index 277c9afc8..4fb477978 100644 --- a/nx-X11/lib/src/locking.h +++ b/nx-X11/lib/src/locking.h @@ -149,6 +149,18 @@ typedef struct _LockInfoRec { xmutex_t lock; } LockInfoRec; +/* A list of threads currently invoking error handlers on this display + * LockDisplay operates differently for these threads, avoiding + * generating any requests or reading any events as that can cause + * recursion into the error handling code, which will deadlock the + * thread. + */ +struct _XErrorThreadInfo +{ + struct _XErrorThreadInfo *next; + xthread_t error_thread; +}; + /* XOpenDis.c */ extern int (*_XInitDisplayLock_fn)(Display *dpy); extern void (*_XFreeDisplayLock_fn)(Display *dpy); -- cgit v1.2.3