X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstdbool_.h;h=e33715a615029e64ae6b705db8b841976c9aaa71;hb=f792a03ccf327e0e80b60e6b7a013e7f89f9f5ca;hp=3dbb51b24b68b20621d7a6bb61d17cc75d3f9082;hpb=825671cfb3ffecf2cba59dabb71cc99a81ef488b;p=gnulib.git

diff --git a/lib/stdbool_.h b/lib/stdbool_.h
index 3dbb51b24..e33715a61 100644
--- a/lib/stdbool_.h
+++ b/lib/stdbool_.h
@@ -56,6 +56,7 @@
 /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
    definitions below, but temporarily we have to #undef them.  */
 #ifdef __BEOS__
+# include <OS.h> /* defines bool but not _Bool */
 # undef false
 # undef true
 #endif
@@ -69,7 +70,7 @@
    (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
    (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
    enum; this ensures that '_Bool' promotes to 'int'.  */
-#ifndef __cplusplus
+#if !(defined __cplusplus || defined __BEOS__)
 # if !@HAVE__BOOL@
 #  if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1)
     /* Avoid stupid "warning: _Bool is a keyword in ISO C99".  */