diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:54:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:54:14 +0200 |
| commit | f09b5fb4afedb711b169a582b2c1b1c61e6653e0 (patch) | |
| tree | a77e3e4e3501f1ecf008abb15191afcb784020df | |
| parent | 756f865e3b66ba7e9b458cc00ccd386a3361978d (diff) | |
| parent | 0f1fb6c0194c85483dedb93b20a5b76f6fc9d520 (diff) | |
| download | ffmpeg-f09b5fb4afedb711b169a582b2c1b1c61e6653e0.tar.gz | |
Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'
* commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520':
libavutil: Don't use fcntl if the function does not exist
cmdutils: Only do the windows-specific commandline parsing on _WIN32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 6eb093df18..b1d831d325 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -213,7 +213,10 @@ static const OptionDef *find_option(const OptionDef *po, const char *name) return po; } -#if HAVE_COMMANDLINETOARGVW +/* _WIN32 means using the windows libc - cygwin doesn't define that + * by default. HAVE_COMMANDLINETOARGVW is true on cygwin, while + * it doesn't provide the actual command line via GetCommandLineW(). */ +#if HAVE_COMMANDLINETOARGVW && defined(_WIN32) #include <windows.h> #include <shellapi.h> /* Will be leaked on exit */ |