From 63d70147fe680b44752c927b88bd240cbcd958cc Mon Sep 17 00:00:00 2001 From: Lawrin Novitsky Date: Sat, 9 Jul 2016 14:03:23 +0200 Subject: [PATCH] Moved c++ish declaration in the ma_tls_connect(libmariadb/secure/schannel.c) to other declarations on top of the function. It prevernted build at least with vs2010 --- libmariadb/secure/schannel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libmariadb/secure/schannel.c b/libmariadb/secure/schannel.c index 5555452d..29205172 100644 --- a/libmariadb/secure/schannel.c +++ b/libmariadb/secure/schannel.c @@ -305,10 +305,11 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls) my_bool rc= 1; SC_CTX *sctx; SECURITY_STATUS sRet; - PCCERT_CONTEXT pRemoteCertContext = NULL, + PCCERT_CONTEXT pRemoteCertContext= NULL, pLocalCertContext= NULL; ALG_ID AlgId[MAX_ALG_ID]; - + WORD validTokens = 0; + if (!ctls || !ctls->pvio) return 1;; @@ -326,7 +327,6 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls) ZeroMemory(&Cred, sizeof(SCHANNEL_CRED)); - WORD validTokens = 0; /* Set cipher */ if (mysql->options.ssl_cipher) {