diff options
| author | Martin Storsjö <martin@martin.st> | 2012-09-13 14:26:10 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-13 14:56:54 +0300 |
| commit | ca6b544ac9d07dcd4d151d5729f0bf52f4f8653d (patch) | |
| tree | 58ac42ece4e057cd6c2bde0232e0324895c39c56 | |
| parent | 7b07fab5675a616749ba6b9d0dfd89f1b51bdb8e (diff) | |
| download | ffmpeg-ca6b544ac9d07dcd4d151d5729f0bf52f4f8653d.tar.gz | |
os_support: Choose between direct.h and io.h using a configure check
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavformat/os_support.h | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -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 4ec37bdc77..1bf79ebc6d 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 |