Commit 1f724502 authored by Sergei Golubchik's avatar Sergei Golubchik

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

This reverts commit a1b6691f.

because #ifdef checks the symbol defined in ssl_compat.h,
so #include <ssl_compat.h> cannot be inside #ifdef
parent d32fc5b8
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <my_global.h> #include <my_global.h>
#include <ssl_compat.h>
/* /*
The check is only done for OpenSSL 1.1.x. The check is only done for OpenSSL 1.1.x.
...@@ -24,14 +25,12 @@ ...@@ -24,14 +25,12 @@
*/ */
#ifndef HAVE_OPENSSL11 #ifndef HAVE_OPENSSL11
#include <ssl_compat.h>
int check_openssl_compatibility() int check_openssl_compatibility()
{ {
return 0; return 0;
} }
#else #else
#include <openssl/evp.h> #include <openssl/evp.h>
#include <ssl_compat.h>
static uint testing; static uint testing;
size_t alloc_size, alloc_count; size_t alloc_size, alloc_count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment