summaryrefslogtreecommitdiff
path: root/libavformat/os_support.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-06-24 21:29:14 +0300
committerMartin Storsjö <martin@martin.st>2012-06-30 15:16:43 +0300
commit5aff37d28d6a140f70f6cae996e6f55b21b1106d (patch)
treecb7863a3f2e2e93980feba1282b1dfa00d174b86 /libavformat/os_support.c
parentf2fd167835b6f039a593e46ab3a84e1b9a453660 (diff)
downloadffmpeg-5aff37d28d6a140f70f6cae996e6f55b21b1106d.tar.gz
os_support: Include all the necessary headers for the win32 open function
io.h is required for open and _wopen, and fcntl.h is required for the O_CREAT flag. On mingw, fcntl.h is included by os_support.h (and the mingw fcntl.h includes io.h), but include it explicitly here since this implementation requires it. Also move the #undef open up. open must not be defined to ff_win32_open while including the headers that declare the open function. On mingw, this happened in os_support.h before open was redirected. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/os_support.c')
-rw-r--r--libavformat/os_support.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 0cbaf453db..8054ba6bbb 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -28,9 +28,11 @@
#include "os_support.h"
#if defined(_WIN32) && !defined(__MINGW32CE__)
+#undef open
+#include <fcntl.h>
+#include <io.h>
#include <windows.h>
-#undef open
int ff_win32_open(const char *filename_utf8, int oflag, int pmode)
{
int fd;