diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-09-20 16:58:18 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-09-20 16:58:18 -0500 |
| commit | c73eb5f814d1096cd398fbec3084f816ba8a7269 (patch) | |
| tree | dcc910baf89751a845717ca933aa3ed91ceebdd9 | |
| parent | dd2951393f39967bcda55c03eb1b8d67c0c3d504 (diff) | |
| download | tdebase-c73eb5f814d1096cd398fbec3084f816ba8a7269.tar.gz tdebase-c73eb5f814d1096cd398fbec3084f816ba8a7269.zip | |
Fix FTBFS due to Xlib defined keywords
This resolves Bug 2530
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.h | 3 | ||||
| -rw-r--r-- | kcontrol/randr/tderandrtray.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index dce061003..78b033f14 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 8f382922f..334e1ef31 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; |