BeOS portability.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5f67abe33eb5b79db9cf277a6ab5ae71030b9c66..385e260d10d4e827ffbb71349df7cfca1d566067 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+       * stdbool.h.in: Avoid syntax error on BeOS if <sys/socket.h> has
+       already been included.
+
 2001-10-21  Bruno Haible  <haible@clisp.cons.org>
 
        * basename.c: #undef basename before defining it. This avoids a

diff --git a/lib/stdbool.h.in b/lib/stdbool.h.in
index 773432f9a79713146d2fc8c09db0314f087a36cc..16b43886df0ade4c50c8237f021031a496a59461 100644 (file)
--- a/lib/stdbool.h.in
+++ b/lib/stdbool.h.in
@@ -22,6 +22,13 @@
 
 /* 7.16. Boolean type and values */
 
+/* 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__
+# undef false
+# undef true
+#endif
+
 /* For the sake of symbolic names in gdb, define _Bool as an enum type.  */
 #ifndef __cplusplus
 typedef enum { false = 0, true = 1 } _Bool;

diff --git a/src/ChangeLog b/src/ChangeLog
index b9f53207d485198593cda9505f8044f6aa3f68e6..c67051e03710706a4b25c94923dd61e701bc3d92 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-21  Bruno Haible  <haible@clisp.cons.org>
+
+       * msgexec.c [BeOS]: Fix #ifdef conditional.
+
 2001-10-21  Bruno Haible  <haible@clisp.cons.org>
 
        * read-java.c (execute_and_read_po_output): Return false, not 0.

diff --git a/src/msgexec.c b/src/msgexec.c
index 9adada21e68252a54db567b3e14e6221d96ce42a..4d50336fbd0891cba41836af1575fc82715723da 100644 (file)
--- a/src/msgexec.c
+++ b/src/msgexec.c
@@ -63,7 +63,7 @@
    looping while waiting for the child.  Not good.)  */
 
 /* On BeOS select() works only on sockets, not on normal file descriptors.  */
-#ifdef __BeOS__
+#ifdef __BEOS__
 # undef HAVE_SELECT
 #endif