[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       David Faure <faure () kde ! org>
Date:       2009-03-27 14:43:01
Message-ID: 1238164981.976564.7776.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 945494 by dfaure:

Fix fixx11h.h for the case where X11/Xdefs.h is thrown into the mix.
Took testcase from https://bugs.gentoo.org/show_bug.cgi?id=263823#c8 and extended it.
CCMAIL: reavertm@poczta.fm


 M  +2 -0      tests/CMakeLists.txt  
 A             tests/fixx11h_test.cpp   [License: UNKNOWN]
 A             tests/fixx11h_test2.cpp   [License: UNKNOWN]
 M  +8 -3      util/fixx11h.h  


--- trunk/KDE/kdelibs/kdeui/tests/CMakeLists.txt #945493:945494
@@ -110,6 +110,8 @@
   kwidgetitemdelegatetest
   kanimatedbuttontest
   kxmlguiwindowtest
+  fixx11h_test
+  fixx11h_test2
 )
 
 if (Q_WS_X11)
--- trunk/KDE/kdelibs/kdeui/util/fixx11h.h #945493:945494
@@ -89,11 +89,16 @@
 #ifdef Bool
 #ifndef FIXX11H_Bool
 #define FIXX11H_Bool
-typedef Bool XBool;
-#undef Bool
-typedef XBool Bool;
+#ifdef _XTYPEDEF_BOOL /* Xdefs.h has typedef'ed Bool already */
+ #undef Bool
+#else
+ typedef Bool XBool;
+ #undef Bool
+ typedef XBool Bool;
 #endif
+#endif
 #undef Bool
+#define _XTYPEDEF_BOOL
 #endif
 // template <---
 
[prev in list] [next in list] [prev in thread] [next in thread]