summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Weinhold <ingo_weinhold@gmx.de>2008-11-10 12:30:58 +0100
committerBruno Haible <bruno@clisp.org>2008-11-10 12:30:58 +0100
commit40d88197eef9efb44102f8fd6ce10141ca61fb3c (patch)
tree36c72fb266c2543ac90516ef11869c0fbe461200
parent7cefd297bc0d1dc3c91bc39932f1ac965245cead (diff)
downloadgnulib-40d88197eef9efb44102f8fd6ce10141ca61fb3c.tar.gz
Treat Haiku like BeOS.
-rw-r--r--ChangeLog11
-rw-r--r--lib/binary-io.h4
-rw-r--r--lib/fcntl.in.h4
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 29047337d4..bb653945dd 100644
--- 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 9bfddf19b9..b1dc629164 100644
--- 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 af86c83222..fd7520e8da 100644
--- 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