mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-02 05:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Revert "MDEV-23925: Fixed warnings generated during compilation of mysys_ssl/openssl.c on MacOS"

Browse source 
This reverts commit a1b6691f93.

because #ifdef checks the symbol defined in ssl_compat.h,
so #include <ssl_compat.h> cannot be inside #ifdef
This commit is contained in:
Sergei Golubchik 2023-06-22 15:24:09 +02:00
parent d32fc5b8e0
commit 1f72450260
1 changed files with 1 additions and 2 deletions

3
mysys_ssl/openssl.c
View file

@ -15,6 +15,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <my_global.h>
#include <ssl_compat.h>
/*
The check is only done for OpenSSL 1.1.x.
@ -24,14 +25,12 @@
*/
#ifndef HAVE_OPENSSL11
#include <ssl_compat.h>
int check_openssl_compatibility()
{
return 0;
}
#else
#include <openssl/evp.h>
#include <ssl_compat.h>
static uint testing;
size_t alloc_size, alloc_count;