summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2018-11-20 20:53:50 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-11-21 01:07:43 +0100
commit2bf8469cbca01e53043097708909f6cdf2aae264 (patch)
tree3b8c16b589f200439b5ecf3470f4660043d39e0e
parent29693c9c12c947e04f37adfd56290ae3abd18490 (diff)
Fix headless build on Linux
Conditional-compile some OpenGL-ness that crept in Change-Id: I8d12f34db3b4875470a0d81e9ef6a1654153b206 Reviewed-on: https://gerrit.libreoffice.org/63676 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--vcl/headless/svpinst.cxx4
-rw-r--r--vcl/source/outdev/text.cxx4
2 files changed, 6 insertions, 2 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 5f7176e748d1..330b69ab27dd 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -28,7 +28,9 @@
#include <sal/log.hxx>
#include <vcl/inputtypes.hxx>
-#include <vcl/opengl/OpenGLContext.hxx>
+#ifndef LIBO_HEADLESS
+# include <vcl/opengl/OpenGLContext.hxx>
+#endif
#include <headless/svpinst.hxx>
#include <headless/svpframe.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index c6dbedddbe5c..2bb81ad8da2d 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -35,7 +35,9 @@
#include <vcl/sysdata.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/controllayout.hxx>
-#include <vcl/opengl/OpenGLHelper.hxx>
+#ifdef MACOSX
+# include <vcl/opengl/OpenGLHelper.hxx>
+#endif
#include <outdata.hxx>
#include <outdev.h>