X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbinary-io.h;h=d9892d33b4fdeb11c78a8c5f83d6657c41e9bb0c;hb=82beda827f870714b416ed46566105eafd24725e;hp=2229f84c7a9c931aabd7ac8836f2eb63765213e8;hpb=c3d8942f1dc6ac4a48a09afa12cbea7842892f7d;p=gnulib.git

diff --git a/lib/binary-io.h b/lib/binary-io.h
index 2229f84c7..d9892d33b 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -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,14 @@
 # undef O_TEXT
 #endif
 #if O_BINARY
-# if !(defined __EMX__ || defined __DJGPP__)
+# if !(defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__)
 #  define setmode _setmode
 #  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
@@ -53,6 +55,7 @@
 # endif
 #else
   /* On reasonable systems, binary I/O is the default.  */
+# undef O_BINARY
 # define O_BINARY 0
 # define SET_BINARY(fd) /* nothing */
 #endif