From e565d346fc949782703bdefa4d3ce8777b7940a9 Mon Sep 17 00:00:00 2001
From: Jorenz Paragas <j.paragas.237@gmail.com>
Date: Thu, 4 Feb 2016 19:52:55 -0800
Subject: 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>
---
 vcl/unx/generic/gdi/gdiimpl.hxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'vcl/unx/generic/gdi/gdiimpl.hxx')

diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index f964e4a59131..d637237d7871 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX
 #define INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX
 
-#include <prex.h>
-#include <postx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrender.h>
 
 #include "unx/saltype.h"
 #include "unx/x11/x11gdiimpl.h"
@@ -30,6 +31,9 @@
 
 #include <basegfx/polygon/b2dtrapezoid.hxx>
 
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
 class SalGraphics;
 class SalBitmap;
 class SalPolyLine;
-- 
cgit