diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-03-31 21:32:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-03-31 21:32:41 +0200 |
| commit | ac5a534a4caa6c86762e721dfe7183be2fee29ca (patch) | |
| tree | a3d40e82beeef165e5965aec282a458b1febf23a /include | |
| parent | e093e5abbed1a7883b8a78935c11505bd0bcb0d6 (diff) | |
| parent | eaebe8b5600b144c51a9405de42a70bd4b710987 (diff) | |
| download | mariadb-git-ac5a534a4caa6c86762e721dfe7183be2fee29ca.tar.gz | |
Merge remote-tracking branch '10.4' into 10.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/service_encryption.h | 2 | ||||
| -rw-r--r-- | include/ssl_compat.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/mysql/service_encryption.h b/include/mysql/service_encryption.h index 280b9c69e35..4963940758c 100644 --- a/include/mysql/service_encryption.h +++ b/include/mysql/service_encryption.h @@ -30,8 +30,6 @@ #ifndef __cplusplus #define inline __inline #endif -#else -#include <stdlib.h> #endif #endif diff --git a/include/ssl_compat.h b/include/ssl_compat.h index 6db1baab9b5..bea3484a1f2 100644 --- a/include/ssl_compat.h +++ b/include/ssl_compat.h @@ -19,7 +19,8 @@ /* OpenSSL version specific definitions */ #if defined(OPENSSL_VERSION_NUMBER) -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ + !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) #define HAVE_OPENSSL11 1 #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) #define ERR_remove_state(X) ERR_clear_error() |