From: Simon Rozman Date: Tue, 10 Oct 2017 23:11:19 +0000 (+0200) Subject: Mixing wide and regular strings in concatenations is not allowed in MSVC. X-Git-Tag: v2.4.5~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e9da5a55673fe01ae7b780f0c438c81773109d5;p=thirdparty%2Fopenvpn.git Mixing wide and regular strings in concatenations is not allowed in MSVC. Acked-by: Selva Nair Message-Id: <20171010231130.6832-2-simon@rozman.si> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15579.html Signed-off-by: Gert Doering (cherry picked from commit d6e0917922793315b06aba395ed0666e17c5b44c) --- diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 0809fdd12..823b25beb 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -370,12 +370,12 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options) BOOL ret = FALSE; int i; const WCHAR *msg1 = L"You have specified a config file location (%s relative to %s)" - " that requires admin approval. This error may be avoided" - " by adding your account to the \"%s\" group"; + L" that requires admin approval. This error may be avoided" + L" by adding your account to the \"%s\" group"; const WCHAR *msg2 = L"You have specified an option (%s) that may be used" - " only with admin approval. This error may be avoided" - " by adding your account to the \"%s\" group"; + L" only with admin approval. This error may be avoided" + L" by adding your account to the \"%s\" group"; argv = CommandLineToArgvW(options, &argc);