From b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 12 Jan 2011 22:19:14 +0000
Subject: [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
---
 kdecore/fixx11h.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'kdecore/fixx11h.h')

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.
-- 
cgit v1.2.1