diff options
author | Martin Storsjö <martin@martin.st> | 2012-11-29 17:02:24 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-11-29 18:19:36 +0200 |
commit | 15caccb9be2a50ffe0dabd3202bcc272d1d7ff1d (patch) | |
tree | 2b61fbd2db19d6386aa03aa216747ac7b81178ad | |
parent | 9d46eaec7a90bd8f5cd9e45398c6d17804182320 (diff) | |
download | ffmpeg-15caccb9be2a50ffe0dabd3202bcc272d1d7ff1d.tar.gz |
cmdutils: Use a configure check for enabling CommandLineToArgvW
This simplifies the condition to avoid hardcoding the systems
where the function exists. This also simplifies support for
newer Windows API subsets where this function doesn't exist,
such as Windows Phone 8 and the "metro" API subset of Windows 8.
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r-- | cmdutils.c | 4 | ||||
-rwxr-xr-x | configure | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c index 2329120c57..6746be143f 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -166,7 +166,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 */ @@ -226,7 +226,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) @@ -1181,6 +1181,7 @@ HAVE_LIST=" attribute_packed closesocket cmov + CommandLineToArgvW cpunop CryptGenRandom dcbzl |