diff options
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 12 | ||||
| -rw-r--r-- | vio/viosslfactories.c | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 381d028d6a0..f3799351de9 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -391,7 +391,9 @@ my_bool vio_poll_read(Vio *vio,uint timeout) void vio_timeout(Vio *vio, uint which, uint timeout) { #if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO) +#ifndef DBUG_OFF int r; +#endif DBUG_ENTER("vio_timeout"); { @@ -405,10 +407,12 @@ void vio_timeout(Vio *vio, uint which, uint timeout) wait_timeout.tv_usec= 0; #endif - r= setsockopt(vio->sd, SOL_SOCKET, which ? SO_SNDTIMEO : SO_RCVTIMEO, - IF_WIN(const char*, const void*)&wait_timeout, - sizeof(wait_timeout)); - +#ifndef DBUG_OFF + r= +#endif + setsockopt(vio->sd, SOL_SOCKET, which ? SO_SNDTIMEO : SO_RCVTIMEO, + IF_WIN(const char*, const void*)&wait_timeout, + sizeof(wait_timeout)); } #ifndef DBUG_OFF diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 3c0c2f3a7ec..31863a0830f 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -300,7 +300,8 @@ new_VioSSLConnectorFd(const char *key_file, const char *cert_file, verify= SSL_VERIFY_NONE; if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file, - ca_path, cipher, TLSv1_client_method(), &dummy))) + ca_path, cipher, + (SSL_METHOD*) TLSv1_client_method(), &dummy))) { return 0; } @@ -322,7 +323,8 @@ new_VioSSLAcceptorFd(const char *key_file, const char *cert_file, struct st_VioSSLFd *ssl_fd; int verify= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE; if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file, - ca_path, cipher, TLSv1_server_method(), error))) + ca_path, cipher, + (SSL_METHOD*) TLSv1_server_method(), error))) { return 0; } |