binmode stdin on mingw, not just msvc

diff --git a/common/osdep.h b/common/osdep.h
index c7353e0dac3baab7c5c93e0bb128947a66cbc2d4..18c7c4877476938062df195fbd468603a47b6411 100644 (file)
--- 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

diff --git a/x264.c b/x264.c
index 8484cadd5879a0c3af33706b9e5e625952d85225..d78461f36bc21df2f233c439288e7667e51b3ecc 100644 (file)
--- 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