diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
| commit | 2c3c851d2cba73825f81cd06220138b15c17ae4d (patch) | |
| tree | 4130cf52868c41beb3c242ad229031cca73d7e1c /include/violite.h | |
| parent | 474290540a829edcc6a74be8c354053f330bf5de (diff) | |
| parent | 8648b9bed86e9f52c027daec760d6ab5ce52e889 (diff) | |
| download | mariadb-git-2c3c851d2cba73825f81cd06220138b15c17ae4d.tar.gz | |
Merge 10.3 into 10.4
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 1d981c8bf83..3a163d45976 100644 --- a/include/violite.h +++ b/include/violite.h @@ -150,6 +150,9 @@ typedef my_socket YASSL_SOCKET_T; #include <openssl/ssl.h> #undef Timeval #include <openssl/err.h> +#ifdef DEPRECATED +#undef DEPRECATED +#endif enum enum_ssl_init_error { |