[patch] clean up the namespace after including headers from X.org

kcm_keyboard-cleanup_after_X11_includes-1.diff (text/plain), 1.09 KB, created by Erik on 2010-12-25 07:04:36 UTC

diff -ru kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp.orig kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp
--- kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp	2010-09-30 23:20:14.000000000 +0200
+++ /home/work/programmering/kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp	2010-12-25 07:42:24.628000182 +0100
@@ -27,6 +27,9 @@
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBrules.h>
+// clean up after X.h/Xlib.h
+#undef Bool
+#undef Unsorted
 
 
 // more information about the limit https://bugs.freedesktop.org/show_bug.cgi?id=19501
diff -ru kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp
--- kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp	2010-09-30 23:20:14.000000000 +0200
+++ /home/work/programmering/kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp	2010-12-25 07:51:18.672999713 +0100
@@ -31,6 +31,10 @@
 #include <X11/extensions/XInput.h>
 #endif
 
+// clean up after X.h/Xlib.h
+#undef Bool
+#undef Unsorted
+
 #include "x11_helper.h"