summaryrefslogtreecommitdiffstats
path: root/kdecore/fixx11h.h
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-12 22:19:14 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-12 22:19:14 +0000
commitb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (patch)
tree775ed08d953f154791b1246f9dbd2d2f74a57873 /kdecore/fixx11h.h
parent0ba4e3c0a468d0ce3d64c4062a39e8a792b29b93 (diff)
downloadtdelibs-b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c.tar.gz
tdelibs-b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c.zip
[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
Diffstat (limited to 'kdecore/fixx11h.h')
-rw-r--r--kdecore/fixx11h.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/kdecore/fixx11h.h b/kdecore/fixx11h.h
index ec8e53ab9..e572335a1 100644
--- 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.