summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-08-15 08:02:36 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-08-15 08:02:36 +0200
commit3c3c0bfd1f5b987ee42786de25259c46393fe343 (patch)
tree1868a78bbf3167445e2e1b0da04d8a6dd406ff95
parent9196c482564e74e310b48e1add9f5425efb07ec0 (diff)
Minor problems in MSVC build fixed
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--src/tcp_connecter.cpp3
-rw-r--r--src/tcp_listener.cpp3
-rw-r--r--src/zmq.cpp2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index d62740c..b3cd563 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -179,7 +179,8 @@ int zmq::tcp_connecter_t::get_new_reconnect_ivl ()
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 ()
diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp
index 7dae4d1..ef97862 100644
--- a/src/tcp_listener.cpp
+++ b/src/tcp_listener.cpp
@@ -123,7 +123,8 @@ void zmq::tcp_listener_t::close ()
int zmq::tcp_listener_t::set_address (const char *addr_)
{
// 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)
return -1;
diff --git a/src/zmq.cpp b/src/zmq.cpp
index 5fcdd21..1ea08f8 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -593,7 +593,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
#if defined ZMQ_HAVE_WINDOWS
int rc = select (0, &inset, &outset, &errset, ptimeout);
if (unlikely (rc == SOCKET_ERROR)) {
- wsa_error_to_errno ();
+ zmq::wsa_error_to_errno ();
if (errno == ENOTSOCK)
return -1;
wsa_assert (false);