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 /mysys_ssl | |
| parent | 403dc759d0bc5d045da06fb326cdf59b23084953 (diff) | |
| download | mariadb-git-5b0df7433d36cc0fa220f3593382908198ad87a3.tar.gz | |
WolfSSL fixes
remove Timeval workaround (not needed anymore).
add template workaround.
comments.
Diffstat (limited to 'mysys_ssl')
| -rw-r--r-- | mysys_ssl/my_crypt.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc index 02770644259..e512eee9066 100644 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc @@ -18,7 +18,9 @@ #include <my_global.h> #include <string.h> +#define template _template /* bug in WolfSSL 4.4.0, see also violite.h */ #include <openssl/evp.h> +#undef template #include <openssl/aes.h> #include <openssl/err.h> #include <openssl/rand.h> |