From d8931259d0bfd8f4d97402250488a590be2a4453 Mon Sep 17 00:00:00 2001
From: k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Jan 2019 14:53:43 +0000
Subject: internal.h: unify our own stdtbool.h implementation

because we had another one in missing/stdbool.h as well.
Assuming that _Bool does not exist when stdbool.h is absent, I'm in
favor of r57462 implementation rather than r61326.

Note that Visual Studio 2013 has stdbool.h and thus r57462's commit
message is somewhat misleading. This missing/stdbool.h is for Visual
Studio 2012 or older, and for Oracle Solaris Studio 12.2 or older because
it's added in 12.3 https://docs.oracle.com/cd/E24457_01/html/E21987/gkeza.html.

missing/stdbool.h: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 internal.h        | 14 ++------------
 missing/stdbool.h | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/internal.h b/internal.h
index b51037e0dc..c6cf73bf10 100644
--- a/internal.h
+++ b/internal.h
@@ -23,18 +23,8 @@ extern "C" {
 
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
-#endif
-
-#ifndef __bool_true_false_are_defined
-# ifndef __cplusplus
-#  undef bool
-#  undef false
-#  undef true
-#  define bool signed char
-#  define false 0
-#  define true 1
-#  define __bool_true_false_are_defined 1
-# endif
+#else
+# include "missing/stdbool.h"
 #endif
 
 /* The most significant bit of the lower part of half-long integer.
diff --git a/missing/stdbool.h b/missing/stdbool.h
index 68c2f3d254..f370e01e92 100644
--- a/missing/stdbool.h
+++ b/missing/stdbool.h
@@ -5,16 +5,16 @@
 #ifndef _MISSING_STDBOOL_H_
 #define _MISSING_STDBOOL_H_
 
-#ifndef __cplusplus
-
-#define bool _Bool
-#define true 1
-#define false 0
-
-#ifndef HAVE__BOOL /* AC_HEADER_STDBOOL in configure.ac */
-typedef int _Bool;
-#endif /* HAVE__BOOL */
-
-#endif /* __cplusplus */
+#ifndef __bool_true_false_are_defined
+# ifndef __cplusplus
+#  undef bool
+#  undef false
+#  undef true
+#  define bool signed char
+#  define false 0
+#  define true 1
+#  define __bool_true_false_are_defined 1
+# endif
+#endif
 
 #endif /* _MISSING_STDBOOL_H_ */
-- 
cgit v1.2.3