From 66a297975d19e0d9b8a5ff8a723dcd2116a506ce Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Sat, 7 Jul 2012 13:46:26 -0700
Subject: [PATCH] cmutils: include shellapi.h on Win32 (for
 CommandLineToArgvW).

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.
---
 cmdutils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmdutils.c b/cmdutils.c
index 6d13bd6b4d..11a5f03eec 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;