3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 23:51:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1742 from jemc/master

Browse Source 
Problem: `udp_address::interface` conflicts with VS2015 build.
This commit is contained in:
Doron Somech 2016-01-30 09:06:40 +01:00
commit 73f73ddaa9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/udp_address.cpp
View File

@ -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

2
src/udp_address.hpp
View File

@ -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;