diff th_types.h @ 457:85fa3d333556

Actually, revert the boolean changes .. meh.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 02 Jan 2018 23:09:29 +0200
parents 1bf886fa9db5
children e4ce60239d16
line wrap: on
line diff
--- a/th_types.h	Tue Jan 02 22:57:47 2018 +0200
+++ b/th_types.h	Tue Jan 02 23:09:29 2018 +0200
@@ -24,11 +24,6 @@
 #  endif
 #endif
 
-#ifdef HAVE_STDBOOL_H
-#  define HAVE_BOOL 1
-#  include <stdbool.h>
-#endif
-
 #ifdef HAVE_INTTYPES_H
 #  include <inttypes.h>
 #endif
@@ -176,15 +171,16 @@
 
 /* Define a boolean type, if needed
  */
-#ifndef HAVE_BOOL
-#  if !defined(false) && !defined(true) && !defined(bool)
-typedef enum { false = 0, true = 1 } bool;
-#  endif
-#  ifndef bool
-#    define bool int
-#  endif
+#if !defined(FALSE) && !defined(TRUE) && !defined(BOOL)
+typedef enum { FALSE = 0, TRUE = 1 } BOOL;
+#endif
 
-#endif // !HAVE_BOOL
-
+#ifndef BOOL
+#    ifdef bool
+#        define BOOL bool
+#    else
+#        define BOOL int
+#    endif
+#endif
 
 #endif // TH_TYPES_H