diff options
-rw-r--r-- | lib/ChangeLog | 5 | ||||
-rw-r--r-- | lib/stdbool.h.in | 7 | ||||
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/msgexec.c | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 5f67abe..385e260 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,10 @@ 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 warning on non-glibc platforms. diff --git a/lib/stdbool.h.in b/lib/stdbool.h.in index 773432f..16b4388 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 b9f5320..c67051e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 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. 2001-10-11 Bruno Haible <haible@clisp.cons.org> diff --git a/src/msgexec.c b/src/msgexec.c index 9adada2..4d50336 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 |