__bool_true_false_are_defined handling

diff --git a/doomgeneric/doomtype.h b/doomgeneric/doomtype.h
index f837f71a6306caa9dd910d8424d2c6962a105137..7acaa4955ab749d36ff030c97df52f2c7520162b 100644 (file)
--- a/doomgeneric/doomtype.h
+++ b/doomgeneric/doomtype.h
@@ -62,20 +62,22 @@
 
 #include <inttypes.h>
 
-#ifdef __cplusplus || defined(__bool_true_false_are_defined)
+#if defined(__cplusplus) || defined(__bool_true_false_are_defined)
 
 // Use builtin bool type with C++.
 
-typedef int boolean;
+typedef unsigned char boolean;
 
 #else
 
+#ifndef __bool_true_false_are_defined 
 typedef enum 
 {
-    //false    = 0,
-    //true     = 1,
+    false      = 0,
+    true       = 1,
        undef   = 0xFFFFFFFF
 } boolean;
+#endif
 
 #endif