precaution to prevent double typedefs of the bool

diff --git a/lib/setup.h b/lib/setup.h
index 8530f0224d114b521152452db2434d7178c036d6..b893417a4bcba2d774f541476d40893e07f50e50 100644 (file)
--- 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 5c9b19cfaea2b184ad27ddf09ceed59f6989771d..288a01220be3c32a969c286cc55cc63713e934c1 100644 (file)
--- 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