Treat all non-gcc compilers the same.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index fca51d5..cdb731c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,16 @@
+2006-01-26  Bruno Haible  <bruno@clisp.org>
+            Paul Eggert  <eggert@cs.ucla.edu>
+
+       * stdbool_.h (_Bool)
+       [(! (defined __cplusplus || defined __BEOS__)
+         && !defined __GNUC__
+         && !(defined __HP_cc || defined __xlc__
+              || (defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1))
+              || defined __sgi))]:
+       #define to signed char in these cases too; this simplifies
+       the code (so that we don't have to worry about HP-UX, AIX, SunPRO,
+       etc., separately) and makes it more conservative.
+
 2006-01-21  Jim Meyering  <jim@meyering.net>
 
        Sync from the stable (b5) branch of coreutils:

diff --git a/lib/stdbool_.h b/lib/stdbool_.h
index 1b4ae8d..efa80ba 100644 (file)
--- a/lib/stdbool_.h
+++ b/lib/stdbool_.h
@@ -78,26 +78,29 @@
 typedef bool _Bool;
 # endif
 #else
-# if @HAVE__BOOL@
-#  if defined __HP_cc || defined __xlc__
-    /* Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
-       the built-in _Bool type is used.  See
-         http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-         http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-         http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-       Override it.  */
-#   define _Bool signed char
+# if !defined __GNUC__
+   /* If @HAVE__BOOL@:
+        Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
+        the built-in _Bool type is used.  See
+          http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+          http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+          http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+        Similar bugs are likely with other compilers as well; this file
+        wouldn't be used if <stdbool.h> was working.
+        So we override the _Bool type.
+      If !@HAVE__BOOL@:
+        Need to define _Bool ourselves. As 'signed char' or as an enum type?
+        Use of a typedef, with SunPRO C, leads to a stupid
+          "warning: _Bool is a keyword in ISO C99".
+        Use of an enum type, with IRIX cc, leads to a stupid
+          "warning(1185): enumerated type mixed with another type".
+        The only benefit of the enum type, debuggability, is not important
+        with these compilers.  So use 'signed char' and no typedef.  */
+#  define _Bool signed char
 enum { false = 0, true = 1 };
-#  endif
 # else
-#  if (defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1)) || (defined __sgi && !defined __GNUC__)
-    /* With SunPRO C, avoid stupid
-         "warning: _Bool is a keyword in ISO C99".
-       With IRIX cc, avoid stupid
-         "warning(1185): enumerated type mixed with another type".  */
-#   define _Bool signed char
-enum { false = 0, true = 1 };
-#  else
+   /* With this compiler, trust the _Bool type if the compiler has it.  */
+#  if !@HAVE__BOOL@
 typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
 #  endif
 # endif