diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-07-01 00:43:26 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-07-26 17:08:38 +0200 |
| commit | f690bea1dfeda92b5d85fe3166f750cd0fdfd525 (patch) | |
| tree | a05c03a2d58705fccfec6c93a1ffb67283248228 | |
| parent | bc18fcefbb5a36dd3f79c719d7906c266b625a2f (diff) | |
| download | mariadb-git-bb-10.4-wlad-wolfssl.tar.gz | |
Do not compile socket IO code in WolfSSLbb-10.4-wlad-wolfssl
We use own IO callbacks from server code anyway.
| -rw-r--r-- | extra/wolfssl/user_settings.h.in | 1 | ||||
| -rw-r--r-- | vio/viosocket.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in index e0765d92133..65be4542b08 100644 --- a/extra/wolfssl/user_settings.h.in +++ b/extra/wolfssl/user_settings.h.in @@ -13,6 +13,7 @@ #define SESSION_CERT #define KEEP_OUR_CERT #define WOLFSSL_STATIC_RSA +#define WOLFSSL_USER_IO #define WC_RSA_BLINDING #define HAVE_TLS_EXTENSIONS #define HAVE_AES_ECB diff --git a/vio/viosocket.c b/vio/viosocket.c index 6e6d56d8549..9ef703dee8d 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -148,6 +148,10 @@ int vio_socket_io_wait(Vio *vio, enum enum_vio_io_event event) #define VIO_DONTWAIT 0 #endif +#ifndef SOCKET_EAGAIN +#define SOCKET_EAGAIN SOCKET_EWOULDBLOCK +#endif + /* returns number of bytes read or -1 in case of an error */ |