From b0239945a36dafae908259a9a29c2a166ff53cee Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@raeburn.org>
Date: Thu, 29 Dec 2016 20:56:31 -0500
Subject: [PATCH] Initialize thread support for Xlib.

* src/xterm.c (x_initialize) [THREADS_ENABLED]: Call XInitThreads
before doing anything else with X.
---
 src/xterm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/xterm.c b/src/xterm.c
index bdc21e6de02..67bd13a042f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12762,6 +12762,13 @@ x_initialize (void)
   /* Try to use interrupt input; if we can't, then start polling.  */
   Fset_input_interrupt_mode (Qt);
 
+#if THREADS_ENABLED
+  /* This must be called before any other Xlib routines.  */
+  if (XInitThreads () == 0)
+    fprintf (stderr,
+	     "Warning: An error occurred initializing X11 thread support!\n");
+#endif
+
 #ifdef USE_X_TOOLKIT
   XtToolkitInitialize ();
 
-- 
2.39.2