Commit cf5c288d authored by Joe Eli McIlvain's avatar Joe Eli McIlvain

Rename `udp_address::interface` to `iface` for VS2015 build.

Resolves #1739.
parent b784943f
......@@ -100,8 +100,8 @@ int zmq::udp_address_t::resolve (const char *name_)
else
is_mutlicast = false;
interface.s_addr = htons (INADDR_ANY);
if (interface.s_addr == INADDR_NONE) {
iface.s_addr = htons (INADDR_ANY);
if (iface.s_addr == INADDR_NONE) {
errno = EINVAL;
return -1;
}
......@@ -153,7 +153,7 @@ const in_addr zmq::udp_address_t::multicast_ip () const
const in_addr zmq::udp_address_t::interface_ip () const
{
return interface;
return iface;
}
#if defined ZMQ_HAVE_WINDOWS
......
......@@ -73,7 +73,7 @@ namespace zmq
private:
in_addr multicast;
in_addr interface;
in_addr iface;
sockaddr_in bind_address;
sockaddr_in dest_address;
bool is_mutlicast;
......
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