From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 15 Dec 2004 14:05:07 +0000 (+0000)
Subject: precaution to prevent double typedefs of the bool
X-Git-Tag: curl-7_12_3~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95b84adb9b4b3270eb44d415be3d6bce00366729;p=thirdparty%2Fcurl.git

precaution to prevent double typedefs of the bool
---

diff --git a/lib/setup.h b/lib/setup.h
index 8530f0224d..b893417a4b 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -66,7 +66,7 @@
 #define FALSE 0
 #endif
 
-#if !defined(__cplusplus) && !defined(__BEOS__)
+#if !defined(__cplusplus) && !defined(__BEOS__) && !defined(typedef_bool)
 typedef unsigned char bool;
 #define typedef_bool
 #endif
diff --git a/src/setup.h b/src/setup.h
index 5c9b19cfae..288a01220b 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -69,10 +69,9 @@
 #define FALSE 0
 #endif
 
-#ifndef __cplusplus
-#ifndef typedef_bool
+#if !defined(__cplusplus) && !defined(__BEOS__) && !defined(typedef_bool)
 typedef char bool;
-#endif
+#define typedef_bool
 #endif
 
 #ifndef OS