diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 16:36:10 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 16:36:10 +0100 |
| commit | 05dc86c09fb2e001ac80654a97c0870eee6aea82 (patch) | |
| tree | ccc8958214c21e9bc374ba4262a56d4703ffefc5 /include/violite.h | |
| parent | 865548fc8d0574e6418b66def39b6d36bbc0205a (diff) | |
| parent | e126baafbc78f15c794082f0a93740d81041d038 (diff) | |
| download | mariadb-git-05dc86c09fb2e001ac80654a97c0870eee6aea82.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h index 401826c1172..d5ce66c3061 100644 --- a/include/violite.h +++ b/include/violite.h @@ -146,6 +146,10 @@ typedef my_socket YASSL_SOCKET_T; #include <openssl/ssl.h> #include <openssl/err.h> +#ifdef HAVE_ERR_remove_thread_state +#define ERR_remove_state(X) ERR_remove_thread_state(NULL) +#endif + enum enum_ssl_init_error { SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, |