diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-12 09:01:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-12 11:56:36 +0200 |
| commit | f2e65b3dbcd4c0ca91781067255854a0c5141d60 (patch) | |
| tree | 826e880246fc9bfded5c4d318e1a37ea7fb889b4 /vcl | |
| parent | cf47926c3191edfff9e943286c8d87820a1ab3c8 (diff) | |
XInitThreads only when running under X
Change-Id: I5068b5229e88da3b1f00b03a2f1c1aea67526de9
Reviewed-on: https://gerrit.libreoffice.org/61703
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
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) |