Fix FTBFS due to Xlib defined keywords

This resolves Bug 2530
9 years ago · c73eb5f814
parent dd2951393f
commit c73eb5f814
2 changed files with 4 additions and 2 deletions
--- a/kcontrol/displayconfig/displayconfig.h
+++ b/kcontrol/displayconfig/displayconfig.h
@ -34,13 +34,14 @@

 #include <dcopobject.h>

-#include <libtderandr/libtderandr.h>
 #ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
 #else
 #define TDEGenericDevice void
 #endif

+#include <libtderandr/libtderandr.h>
+
 #include "monitorworkspace.h"
 #include "displayconfigbase.h"

--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@ -24,13 +24,14 @@
 #include <ksystemtray.h>
 #include <kglobalaccel.h>

-#include <libtderandr/libtderandr.h>
 #ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
 #else
 #define TDEGenericDevice void
 #endif

+#include <libtderandr/libtderandr.h>
+
 class KHelpMenu;
 class TDEPopupMenu;