vcl/unx/gtk/gtkinst.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit f2e65b3dbcd4c0ca91781067255854a0c5141d60
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 12 09:01:21 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 12 11:56:36 2018 +0200
XInitThreads only when running under X
Change-Id: I5068b5229e88da3b1f00b03a2f1c1aea67526de9
Reviewed-on: https://gerrit.libreoffice.org/61703
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index cc93d73b4080..1366bf84a62e 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -73,6 +73,7 @@ extern "C"
return nullptr;
}
+#if !GTK_CHECK_VERSION(3,0,0) || defined(GDK_WINDOWING_X11)
/* #i92121# workaround deadlocks in the X11 implementation
*/
static const char* pNoXInitThreads = getenv( "SAL_NO_XINITTHREADS" );
@@ -82,6 +83,7 @@ extern "C"
*/
if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
XInitThreads();
+#endif
#if GTK_CHECK_VERSION(3,0,0)
if (gtk_minor_version < 18)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
