os_support: Choose between direct.h and io.h using a configure check

Signed-off-by: Martin Storsjö <martin@martin.st>

diff --git a/configure b/configure
index 5afdab9efd3286654da1858b1ebd468434091437..2e28124348a4d65162c1111e08cbffa128e688cc 100755 (executable)
--- a/configure
+++ b/configure
@@ -1132,6 +1132,7 @@ HAVE_LIST="
     dev_ic_bt8xx_h
     dev_video_bktr_ioctl_bt848_h
     dev_video_meteor_ioctl_meteor_h
+    direct_h
     dlfcn_h
     dlopen
     dos_paths
@@ -3175,6 +3176,7 @@ check_func_headers windows.h MapViewOfFile
 check_func_headers windows.h Sleep
 check_func_headers windows.h VirtualAlloc
 
+check_header direct.h
 check_header dlfcn.h
 check_header dxva.h
 check_header dxva2api.h

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 4ec37bdc77afc2d62f2f9a3f2128f1186f946a0c..1bf79ebc6d8ed5b6ed2abe64624f654bdc7894ae 100644 (file)
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -39,10 +39,10 @@
 #endif /* defined(__MINGW32__) && !defined(__MINGW32CE__) */
 
 #ifdef _WIN32
-#ifdef __MINGW32CE__
-#include <io.h>
-#else
+#if HAVE_DIRECT_H
 #include <direct.h>
+#elif HAVE_IO_H
+#include <io.h>
 #endif
 #define mkdir(a, b) _mkdir(a)
 #else