1
0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00

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

This commit is contained in:
Lawrin Novitsky
2016-07-09 14:03:23 +02:00
parent f0601e0e40
commit 63d70147fe

View File

@@ -305,10 +305,11 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
my_bool rc= 1; my_bool rc= 1;
SC_CTX *sctx; SC_CTX *sctx;
SECURITY_STATUS sRet; SECURITY_STATUS sRet;
PCCERT_CONTEXT pRemoteCertContext = NULL, PCCERT_CONTEXT pRemoteCertContext= NULL,
pLocalCertContext= NULL; pLocalCertContext= NULL;
ALG_ID AlgId[MAX_ALG_ID]; ALG_ID AlgId[MAX_ALG_ID];
WORD validTokens = 0;
if (!ctls || !ctls->pvio) if (!ctls || !ctls->pvio)
return 1;; return 1;;
@@ -326,7 +327,6 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
ZeroMemory(&Cred, sizeof(SCHANNEL_CRED)); ZeroMemory(&Cred, sizeof(SCHANNEL_CRED));
WORD validTokens = 0;
/* Set cipher */ /* Set cipher */
if (mysql->options.ssl_cipher) if (mysql->options.ssl_cipher)
{ {