Merge pull request #1969 from pijyoi/fix_invalidsocket

problem: sockets are not signed int on Windows
This commit is contained in:
Constantin Rack 2016-05-08 10:40:14 +02:00
commit d6aa6e71ec
2 changed files with 2 additions and 2 deletions

View File

@ -271,7 +271,7 @@ int zmq::tcp_connecter_t::open ()
s = open_socket (tcp_addr->family (), SOCK_STREAM, IPPROTO_TCP);
// IPv6 address family not supported, try automatic downgrade to IPv4.
if (s == -1 && tcp_addr->family () == AF_INET6
if (s == zmq::retired_fd && tcp_addr->family () == AF_INET6
&& errno == EAFNOSUPPORT
&& options.ipv6) {
rc = addr->resolved.tcp_addr->resolve (

View File

@ -178,7 +178,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
s = open_socket (address.family (), SOCK_STREAM, IPPROTO_TCP);
// IPv6 address family not supported, try automatic downgrade to IPv4.
if (s == -1 && address.family () == AF_INET6
if (s == zmq::retired_fd && address.family () == AF_INET6
&& errno == EAFNOSUPPORT
&& options.ipv6) {
rc = address.resolve (addr_, true, false);