Hi, On Sat, Jul 7, 2012 at 2:06 PM, Martin Storsjö <[email protected]> wrote: > On Sat, 7 Jul 2012, Ronald S. Bultje wrote: > >> From: "Ronald S. Bultje" <[email protected]> >> >> --- >> cmdutils.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/cmdutils.c b/cmdutils.c >> index 6d13bd6..11a5f03 100644 >> --- a/cmdutils.c >> +++ b/cmdutils.c >> @@ -162,6 +162,7 @@ static const OptionDef *find_option(const OptionDef >> *po, const char *name) >> >> #if defined(_WIN32) && !defined(__MINGW32CE__) >> #include <windows.h> >> +#include <shellapi.h> >> /* Will be leaked on exit */ >> static char** win32_argv_utf8 = NULL; >> static int win32_argc = 0; >> -- >> 1.7.9.5 > > > Ok with me, given that the commit message is amended to mention: > > --8<-- > This is required for CommandLineToArgvW. Normally, shellapi.h is included > implicitly by windows.h, but if we define WIN32_LEAN_AND_MEAN (or some of > the other earlier headers have included windows.h with that option), > windows.h doesn't include this one. > > Thus explicitly include the headers we really need, for clarity and > compatibility. > --8<--
As you wish, pushed with that changed. Ronald _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
