diff options
| author | Jorenz Paragas <j.paragas.237@gmail.com> | 2016-02-04 19:52:55 -0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-22 20:31:47 +0000 |
| commit | e565d346fc949782703bdefa4d3ce8777b7940a9 (patch) | |
| tree | fa75be050cfdd832ea33c0bc04b2f680d26237cf /include/vcl/opengl | |
| parent | 4eea29f79eca05e76bfe90aaa176f39dd0fd80ea (diff) | |
tdf#82577: Remove prex.h and postx.h wrapper headers
Include the X11 headers directly in files that used to include those
wrappers, and add the Pixel typedef to files that use it.
prex.h included headers that a file including prex.h might not need
at all, so when replacing prex.h and postx.h includes, try including
only X11 headers that are actually needed in their place.
Also fix saldisp.hxx and i18n_xkb.cxx relying on indirectly included
X11 headers.
Change-Id: If0c30c7facc28db7f2e410b5e6f1d52d8c7cdfd3
Reviewed-on: https://gerrit.libreoffice.org/22132
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/vcl/opengl')
| -rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/opengl/OpenGLHelper.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index d5a9e3142173..44b8d67fd8d9 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -19,9 +19,9 @@ #elif defined( ANDROID ) #elif defined( LIBO_HEADLESS ) #elif defined( UNX ) -# include <prex.h> +# include <X11/Xlib.h> +# include <X11/Xutil.h> # include "GL/glxew.h" -# include <postx.h> #elif defined( _WIN32 ) #ifndef INCLUDED_PRE_POST_WIN_H #define INCLUDED_PRE_POST_WIN_H diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index 0c7f1961d1fe..87d3fe3ab312 100644 --- a/include/vcl/opengl/OpenGLHelper.hxx +++ b/include/vcl/opengl/OpenGLHelper.hxx @@ -18,9 +18,9 @@ #include <rtl/ustring.hxx> #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) -# include <prex.h> +# include <X11/Xlib.h> +# include <X11/Xutil.h> # include "GL/glxew.h" -# include <postx.h> #endif /// Helper to do a SAL_INFO as well as a GL log. |