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

diff --git a/lib/binary-io.h b/lib/binary-io.h
index 3ff2a375f..d9748ee25 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
 
    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
@@ -13,7 +13,7 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _BINARY_H
 #define _BINARY_H
@@ -37,12 +37,15 @@
 # undef O_TEXT
 #endif
 #if O_BINARY
-# if !(defined __EMX__ || defined __DJGPP__)
+# if !(defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__)
 #  define setmode _setmode
+#  undef fileno
 #  define fileno _fileno
 # endif
-# ifdef __DJGPP__
+# if defined __DJGPP__ || defined __CYGWIN__
 #  include <io.h> /* declares setmode() */
+# endif
+# ifdef __DJGPP__
 #  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