aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/setup.h2
-rw-r--r--src/setup.h5
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/setup.h b/lib/setup.h
index 8530f0224..b893417a4 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 5c9b19cfa..288a01220 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