[kdelibs/kdecore] fixed a conflict between fixx11h.h and Xdefs.h

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214091 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
14 years ago · b31cfd9a1e
parent 0ba4e3c0a4
commit b31cfd9a1e
1 changed files with 3 additions and 0 deletions
--- a/kdecore/fixx11h.h
+++ b/kdecore/fixx11h.h
@ -57,15 +57,18 @@ const XID None = XNone;
 // template --->
 // Affects: Should be without side effects.
 #ifndef _XTYPEDEF_BOOL
 #ifdef Bool
 #ifndef FIXX11H_Bool
 #define FIXX11H_Bool
 typedef Bool XBool;
 #undef Bool
 #define _XTYPEDEF_BOOL
 typedef XBool Bool;
 #endif
 #undef Bool
 #endif
 #endif // _XTYPEDEF_BOOL
 // template <---
 // Affects: Should be without side effects.