diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
commit | 7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8 (patch) | |
tree | a4931bf9418b28824d3ff4c68f4a2d888b584f65 /include/violite.h | |
parent | 42bba9782b36247c6c2241ea4d5996723af273fd (diff) | |
parent | 5008fc709bca54bd29a4d3f35aebf6e25468b9dd (diff) | |
download | mariadb-git-7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include/violite.h')
-rw-r--r-- | include/violite.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h index 208d33b2879..6808a9776de 100644 --- a/include/violite.h +++ b/include/violite.h @@ -149,6 +149,9 @@ typedef my_socket YASSL_SOCKET_T; #define YASSL_SOCKET_T_DEFINED #include <openssl/ssl.h> #include <openssl/err.h> +#ifdef DEPRECATED +#undef DEPRECATED +#endif enum enum_ssl_init_error { |