diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:55:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:55:12 +0100 |
| commit | 034a1afbd85ee18c1b7f3b9be59371173d421c6b (patch) | |
| tree | 7095b4cf27ffb4e43d00bf9e56d4c0c91216f3f7 | |
| parent | db29a7c7c2822a2f2e9804988e279a9fe7d88c11 (diff) | |
| parent | 15816c8e8bd5ab2f027824ea5122d7901633634a (diff) | |
| download | ffmpeg-034a1afbd85ee18c1b7f3b9be59371173d421c6b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Include io.h with a separate condition from MapViewOfFile
cmdutils: Use a configure check for enabling CommandLineToArgvW
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 4 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavutil/file.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/cmdutils.c b/cmdutils.c index 2d9a33dcdd..fd8ff50e38 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -200,7 +200,7 @@ static const OptionDef *find_option(const OptionDef *po, const char *name) return po; } -#if defined(_WIN32) && !defined(__MINGW32CE__) +#if HAVE_COMMANDLINETOARGVW #include <windows.h> #include <shellapi.h> /* Will be leaked on exit */ @@ -260,7 +260,7 @@ static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr) { /* nothing to do */ } -#endif /* WIN32 && !__MINGW32CE__ */ +#endif /* HAVE_COMMANDLINETOARGVW */ int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options) @@ -1324,6 +1324,7 @@ HAVE_LIST=" clock_gettime closesocket cmov + CommandLineToArgvW cpunop CryptGenRandom dcbzl diff --git a/libavutil/file.c b/libavutil/file.c index 5aa4b9c0d1..41850f835b 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -25,10 +25,12 @@ #if HAVE_UNISTD_H #include <unistd.h> #endif +#if HAVE_IO_H +#include <io.h> +#endif #if HAVE_MMAP #include <sys/mman.h> #elif HAVE_MAPVIEWOFFILE -#include <io.h> #include <windows.h> #endif |