Commit 3c3c0bfd authored by Martin Sustrik's avatar Martin Sustrik

Minor problems in MSVC build fixed

Signed-off-by: 's avatarMartin Sustrik <sustrik@250bpm.com>
parent 9196c482
...@@ -179,7 +179,8 @@ int zmq::tcp_connecter_t::get_new_reconnect_ivl () ...@@ -179,7 +179,8 @@ int zmq::tcp_connecter_t::get_new_reconnect_ivl ()
int zmq::tcp_connecter_t::set_address (const char *addr_) int zmq::tcp_connecter_t::set_address (const char *addr_)
{ {
return resolve_ip_hostname (&addr, &addr_len, addr_, options.ipv4only); return resolve_ip_hostname (&addr, &addr_len, addr_,
options.ipv4only ? true : false);
} }
int zmq::tcp_connecter_t::open () int zmq::tcp_connecter_t::open ()
......
...@@ -123,7 +123,8 @@ void zmq::tcp_listener_t::close () ...@@ -123,7 +123,8 @@ void zmq::tcp_listener_t::close ()
int zmq::tcp_listener_t::set_address (const char *addr_) int zmq::tcp_listener_t::set_address (const char *addr_)
{ {
// Convert the interface into sockaddr_in structure. // Convert the interface into sockaddr_in structure.
int rc = resolve_ip_interface (&addr, &addr_len, addr_, options.ipv4only); int rc = resolve_ip_interface (&addr, &addr_len, addr_,
options.ipv4only ? true : false);
if (rc != 0) if (rc != 0)
return -1; return -1;
......
...@@ -593,7 +593,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) ...@@ -593,7 +593,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
int rc = select (0, &inset, &outset, &errset, ptimeout); int rc = select (0, &inset, &outset, &errset, ptimeout);
if (unlikely (rc == SOCKET_ERROR)) { if (unlikely (rc == SOCKET_ERROR)) {
wsa_error_to_errno (); zmq::wsa_error_to_errno ();
if (errno == ENOTSOCK) if (errno == ENOTSOCK)
return -1; return -1;
wsa_assert (false); wsa_assert (false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment