[Libreoffice-commits] core.git: desktop/source

Stephan Bergmann sbergman at redhat.com
Tue Mar 29 10:36:45 UTC 2016


 desktop/source/app/sofficemain.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3273e7facd858c7a5a2d46dc452029a06afe96f2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 29 12:36:06 2016 +0200

    The whole block is only relevant for HAVE_FEATURE_OPENGL
    
    Change-Id: Iae065ee34c5536843ddba39b72b6fff4836cbf86

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index f850cff..1fb8be0 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -91,14 +91,12 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 #endif
 #endif
 
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS)
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL
     /* Run test for OpenGL support in own process to avoid crash with broken
      * OpenGL drivers. Start process as early as possible.
      */
     bool bSuccess = false;
-#if HAVE_FEATURE_OPENGL
     bSuccess = fire_glxtest_process();
-#endif
     SAL_WARN_IF(!bSuccess, "desktop.opengl", "problems with glxtest");
 #endif
 


More information about the Libreoffice-commits mailing list