database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Fix build errors on Solaris 10 with gcc 3.4.3

Browse Source
This commit is contained in:
Vladislav Vaintroub
2016-03-15 18:52:29 +01:00
parent f68b89bc46
commit 8bf85da380
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmariadb/secure/openssl.c
View File

@@ -408,9 +408,10 @@ static int ma_ssl_set_certs(MYSQL *mysql)
if ((certstore= SSL_CTX_get_cert_store(SSL_context))) if ((certstore= SSL_CTX_get_cert_store(SSL_context)))
{ {
if (X509_STORE_load_locations(certstore, mysql->options.extension->ssl_crl, if (X509_STORE_load_locations(certstore, mysql->options.extension->ssl_crl,
mysql->options.extension->ssl_crlpath) == 0 || mysql->options.extension->ssl_crlpath) == 0)
X509_STORE_set_flags(certstore, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL) == 0)
goto error; goto error;
X509_STORE_set_flags(certstore, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
} }
} }
return 0; return 0;

2
zlib/gzguts.h
View File

@@ -12,7 +12,7 @@
# endif # endif
#endif #endif
#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 40) && !defined(NO_VIZ)
# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) # define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
#else #else
# define ZLIB_INTERNAL # define ZLIB_INTERNAL

2
zlib/zutil.h
View File

@@ -13,7 +13,7 @@
#ifndef ZUTIL_H #ifndef ZUTIL_H
#define ZUTIL_H #define ZUTIL_H
#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) #if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 40) && !defined(NO_VIZ)
# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) # define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
#else #else
# define ZLIB_INTERNAL # define ZLIB_INTERNAL