From: Lev Stipakov Date: Mon, 7 Jun 2021 21:26:02 +0300 Message-Id: <20210607182602.273-1-lstipakov@...277...> MIME-Version: 1.0 Subject: [Openvpn-devel] [PATCH] options.c: fix msvc build error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net Cc: Lev Stipakov From: Lev Stipakov Commit b7fe49c ("Do not require CA when peer-fingerprint is used") broke msvc build by adding #ifdef within msg() macro call. options.c(2074,1): error C2121: '#': invalid character: possibly the result of a macro expansion options.c(2074,1): error C2146: syntax error: missing ')' before identifier 'ifndef' options.c(2074,1): error C2059: syntax error: ')' Fix by moving #ifdef outside of msg(). Reported-by: Samuli Seppänen Signed-off-by: Lev Stipakov --- src/openvpn/options.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 6bbe5c15..606e6903 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2067,11 +2067,12 @@ check_ca_required(const struct options *options) return; } - msg(M_USAGE, "You must define CA file (--ca)" + const char* str = "You must define CA file (--ca)" #ifndef ENABLE_CRYPTO_MBEDTLS " or CA path (--capath)" #endif - " and/or peer fingeprint verification " "(--peer-fingerprint)"); + " and/or peer fingeprint verification " "(--peer-fingerprint)"; + msg(M_USAGE, str); } static void -- 2.23.0.windows.1