diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-11-20 20:53:50 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-01-12 17:32:45 +0100 |
| commit | dccc5215f23c5c88e6c71b669d8a550a28dc4b0d (patch) | |
| tree | 460995a24d235cf66424659e2435f70898f351c2 /vcl | |
| parent | 9ee5981193db8d35a80d1cba075895e226ff95e8 (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>
(cherry picked from commit 2bf8469cbca01e53043097708909f6cdf2aae264)
Reviewed-on: https://gerrit.libreoffice.org/63688
(cherry picked from commit b51ca21cd6435a8c8df8df99e4d75a59ea9a2bf1)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/svpinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
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> |