vcl/headless/svpinst.cxx | 4 +++-
vcl/source/outdev/text.cxx | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit dccc5215f23c5c88e6c71b669d8a550a28dc4b0d
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Nov 20 20:53:50 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 12 17:32:45 2019 +0100
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.behr...@cib.de>
(cherry picked from commit 2bf8469cbca01e53043097708909f6cdf2aae264)
Reviewed-on: https://gerrit.libreoffice.org/63688
(cherry picked from commit b51ca21cd6435a8c8df8df99e4d75a59ea9a2bf1)
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 49f4aa213b3a..a9db70591dc5 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -27,7 +27,9 @@
#include <sal/types.h>
#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 6d43a5b9f9a3..f46c2328d63e 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -32,7 +32,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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
