diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-11-20 20:53:50 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-22 15:32:00 +0100 |
| commit | 87d6588b11f7483d05334e6bf2e3f7d5cb8552b7 (patch) | |
| tree | 1f1f64b92e07586010987ca24a73ba9ba0539121 /vcl | |
| parent | d1734718ae5b4e739b1db711479c6e969902fc7c (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/63689
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
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 c3d96016f5f2..68c28d7bfba8 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 211dda947df8..d0b3a80bfc9d 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -34,7 +34,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> |