X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbinary-io.h;h=3ff2a375f434a575ae8afb908511ec0d9bae3a74;hb=87538f0d5dfb46f213de5dfe7ea9ac07bb4c0c9e;hp=ed74c06f277c3d22327040e08d937b023d5a333a;hpb=1375fc09dca2c1dcfa98151c8e468b5bdb70b1bc;p=gnulib.git

diff --git a/lib/binary-io.h b/lib/binary-io.h
index ed74c06f2..3ff2a375f 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -18,9 +18,14 @@
 #ifndef _BINARY_H
 #define _BINARY_H
 
-#include <fcntl.h>
 /* For systems that distinguish between text and binary I/O.
    O_BINARY is usually declared in <fcntl.h>. */
+#include <fcntl.h>
+
+/* The MSVC7 <stdio.h> doesn't like to be included after '#define fileno ...',
+   so we include it here first.  */
+#include <stdio.h>
+
 #if !defined O_BINARY && defined _O_BINARY
   /* For MSC-compatible compilers.  */
 # define O_BINARY _O_BINARY
@@ -48,6 +53,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