X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbinary-io.h;h=b1dc6291647437cbc3aa95363a7a7507626aa793;hb=ce8d6d06c84df409ebb0d71478a122f48cff3dc6;hp=3ff2a375f434a575ae8afb908511ec0d9bae3a74;hpb=b415491eed5aaaa9e2efa992ffcdca6967fa7106;p=gnulib.git

diff --git a/lib/binary-io.h b/lib/binary-io.h
index 3ff2a375f..b1dc62916 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -1,10 +1,10 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _BINARY_H
 #define _BINARY_H
@@ -31,18 +30,20 @@
 # 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
 #if O_BINARY
-# if !(defined __EMX__ || defined __DJGPP__)
+# if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__
+#  include <io.h> /* declares setmode() */
+# else
 #  define setmode _setmode
+#  undef fileno
 #  define fileno _fileno
 # endif
 # ifdef __DJGPP__
-#  include <io.h> /* declares setmode() */
 #  include <unistd.h> /* declares isatty() */
 #  /* Avoid putting stdin/stdout in binary mode if it is connected to the
 #     console, because that would make it impossible for the user to