summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/window
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-04-10 18:59:16 +0300
committerTor Lillqvist <tml@iki.fi>2013-04-10 19:26:05 +0300
commit8034992e22d983bba46cfc06d4eec6f2aab71e28 (patch)
tree1fc2c9b38737f6a36e4c183520f428efb5eff93e /vcl/unx/generic/window
parent9e2cf37c9062577f84406e08f31bd542ba41023f (diff)
Bin a local X11 wrapper header, vcl/inc/unx/salstd.hxx
We already have <tools/prex.h> and <tools/postx.h>, so make those be sufficient instead. Bin another local vcl header vcl/inc/unx/svunx.h that just included those prex.h and postx.h. Adapt includers accordingly. Change-Id: I6638b3260fd3da45478fcc216b41f8c8a539f0d7
Diffstat (limited to 'vcl/unx/generic/window')
-rw-r--r--vcl/unx/generic/window/salobj.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 16b4e22feeea..983292984684 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -21,17 +21,15 @@
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
#endif
-#include <tools/debug.hxx>
-
-#include <vcl/keycodes.hxx>
#include <tools/prex.h>
-#include <X11/Xlib.h>
#include <X11/extensions/shape.h>
#include <tools/postx.h>
+#include <tools/debug.hxx>
+
+#include <vcl/keycodes.hxx>
#include <unx/salunx.h>
-#include <unx/salstd.hxx>
#include <unx/saldata.hxx>
#include <unx/salinst.h>
#include <unx/saldisp.hxx>