diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-08 12:31:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-08 12:49:53 +0200 |
| commit | 5b0df7433d36cc0fa220f3593382908198ad87a3 (patch) | |
| tree | a89a0f3ba90107ed240ba19bae3c71ac8d493dde /include/violite.h | |
| parent | 403dc759d0bc5d045da06fb326cdf59b23084953 (diff) | |
| download | mariadb-git-5b0df7433d36cc0fa220f3593382908198ad87a3.tar.gz | |
WolfSSL fixes
remove Timeval workaround (not needed anymore).
add template workaround.
comments.
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index 3a163d45976..34f59f2e598 100644 --- a/include/violite.h +++ b/include/violite.h @@ -146,9 +146,9 @@ int vio_getnameinfo(const struct sockaddr *sa, /* Set yaSSL to use same type as MySQL do for socket handles */ typedef my_socket YASSL_SOCKET_T; #define YASSL_SOCKET_T_DEFINED -#define Timeval WOLFSSL_Timeval +#define template _template /* bug in WolfSSL 4.4.0, see also my_crypt.cc */ #include <openssl/ssl.h> -#undef Timeval +#undef template #include <openssl/err.h> #ifdef DEPRECATED #undef DEPRECATED |