From e8edf4e1cf6051802ad717dcf8a454d4661929af Mon Sep 17 00:00:00 2001 From: Diogo Franco Date: Wed, 7 Aug 2013 08:25:51 -0300 Subject: cmdutils: Only do the windows-specific commandline parsing on _WIN32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes commandline parsing on Cygwin (on 64 bit, and on very recent 32 bit), where the configure check does find the CommandLineToArgvW function (since it exists in the link libraries and in the headers), but whose GetCommandLineW() only returns the application's path. (This is due to a cygwin internal optimization, see http://cygwin.com/ml/cygwin/2013-07/msg00538.html for details.) Arguments are only given through main's argc/argv, and they're already UTF-8. Signed-off-by: Martin Storsjö --- cmdutils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cmdutils.c') diff --git a/cmdutils.c b/cmdutils.c index 8e43795191..062d7ec2f8 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -182,7 +182,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 #include /* Will be leaked on exit */ -- cgit v1.2.3