Treat Haiku like BeOS.

diff --git a/ChangeLog b/ChangeLog
index 29047337d47374ca2f0429ae9022f1f31f525a71..bb653945dde5011950cf768b5135c46d9279a0ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,18 @@
-2008-11-07  Bruno Haible  <bruno@clisp.org>
+2008-11-10  Ingo Weinhold  <ingo_weinhold@gmx.de>
+
+       * lib/binary-io.h (O_BINARY, O_TEXT): Treat Haiku like BeOS.
+       * lib/fcntl.in.h (O_BINARY, O_TEXT): Likewise.
+
+2008-11-08  Bruno Haible  <bruno@clisp.org>
 
        * m4/sys_ioctl_h.m4 (gl_SYS_IOCTL_H): Avoid using AC_CHECK_DECL inside
        AC_CACHE_CHECK.
 
-2008-11-07  Bruno Haible  <bruno@clisp.org>
+2008-11-08  Bruno Haible  <bruno@clisp.org>
 
        * modules/select-tests (configure.ac): Check for unistd.h, sys/wait.h.
 
-2008-11-07  Bruno Haible  <bruno@clisp.org>
+2008-11-08  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-select-fd.c: New file.
        * tests/test-select-in.sh: New file.

diff --git a/lib/binary-io.h b/lib/binary-io.h
index 9bfddf19b9223a292c2fe45a1d90289852f2b96f..b1dc6291647437cbc3aa95363a7a7507626aa793 100644 (file)
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -30,8 +30,8 @@
 # define O_BINARY _O_BINARY
 # define O_TEXT _O_TEXT
 #endif
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
+#if defined __BEOS__ || defined __HAIKU__
+  /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
 # undef O_BINARY
 # undef O_TEXT
 #endif

diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h
index af86c832220f6bf8775ce74aea1d289fe84ad568..fd7520e8daed331481fdaea90c375176ee314b2e 100644 (file)
--- a/lib/fcntl.in.h
+++ b/lib/fcntl.in.h
@@ -127,8 +127,8 @@ extern void _gl_register_fd (int fd, const char *filename);
 # define O_TEXT _O_TEXT
 #endif
 
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
+#if defined __BEOS__ || defined __HAIKU__
+  /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
 # undef O_BINARY
 # undef O_TEXT
 #endif