Branch: master

c73eb5f8 2015-09-20 16:58:18 Timothy Pearson
Fix FTBFS due to Xlib defined keywords
This resolves Bug 2530
M kcontrol/displayconfig/displayconfig.h
M kcontrol/randr/tderandrtray.h
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h
index dce0610..78b033f 100644
--- 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"
 
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 8f38292..334e1ef 100644
--- 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;