Module: libav Branch: master Commit: ca6b544ac9d07dcd4d151d5729f0bf52f4f8653d
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Thu Sep 13 14:26:10 2012 +0300 os_support: Choose between direct.h and io.h using a configure check Signed-off-by: Martin Storsjö <[email protected]> --- configure | 2 ++ libavformat/os_support.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 5afdab9..2e28124 100755 --- 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 4ec37bd..1bf79eb 100644 --- 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 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
