binmode stdin on mingw, not just msvc

57985796 · Anton Mitrofanov · Loren Merritt · 71a919d4 · 57985796 · 57985796
Commit 57985796 authored May 24, 2008 by Anton Mitrofanov Committed by Loren Merritt Jun 03, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

common/osdep.h common/osdep.h +4 -1

x264.c x264.c +1 -1

No files found.
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -31,9 +31,12 @@
 #include <inttypes.h>
 #endif

-#ifdef _MSC_VER
+#ifdef _WIN32
 #include <io.h>    // _setmode()
 #include <fcntl.h> // _O_BINARY
+#endif
+
+#ifdef _MSC_VER
 #define inline __inline
 #define strcasecmp stricmp
 #define strncasecmp strnicmp

--- a/x264.c
+++ b/x264.c
@@ -90,7 +90,7 @@ int main( int argc, char **argv )
    pthread_win32_thread_attach_np();
 #endif

-#ifdef _MSC_VER
+#ifdef _WIN32
    _setmode(_fileno(stdin), _O_BINARY);
    _setmode(_fileno(stdout), _O_BINARY);
 #endif