Commit f09b5fb4 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0f1fb6c0'

* commit '0f1fb6c0':
  libavutil: Don't use fcntl if the function does not exist
  cmdutils: Only do the windows-specific commandline parsing on _WIN32
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 756f865e 0f1fb6c0
...@@ -213,7 +213,10 @@ static const OptionDef *find_option(const OptionDef *po, const char *name) ...@@ -213,7 +213,10 @@ static const OptionDef *find_option(const OptionDef *po, const char *name)
return po; 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 <windows.h>
#include <shellapi.h> #include <shellapi.h>
/* Will be leaked on exit */ /* Will be leaked on exit */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment