From: Bruno Haible <bruno@clisp.org>
Date: Fri, 26 Oct 2001 09:38:10 +0000 (+0000)
Subject: BeOS portability.
X-Git-Tag: v0.11~389
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b4b1e8afcce742d2dffc9e4263e3a058c1204e0;p=thirdparty%2Fgettext.git

BeOS portability.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5f67abe33..385e260d1 100644
--- 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 773432f9a..16b43886d 100644
--- 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 b9f53207d..c67051e03 100644
--- 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 9adada21e..4d50336fb 100644
--- 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