diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:43:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:43:36 +0200 |
| commit | 13038e4705ed55e24362dfad977a1ee454cfebfd (patch) | |
| tree | ac3d37fe69e802dec8008748b86cc901f116eead /include/violite.h | |
| parent | 72c7b4eb4cc86ca2f6bdb9e105b67d39df018a40 (diff) | |
| parent | f5844e7c4bc693783f088a5fc9c399b786ddc8c1 (diff) | |
| download | mariadb-git-13038e4705ed55e24362dfad977a1ee454cfebfd.tar.gz | |
Merge branch '10.4' into 10.5
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 51aada128cf..4c2eef64a1b 100644 --- a/include/violite.h +++ b/include/violite.h @@ -149,9 +149,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 |