summaryrefslogtreecommitdiff
path: root/src/ip.cpp
diff options
context:
space:
mode:
authorMartin Lucina <martin@lucina.net>2012-01-23 09:00:28 +0100
committerMartin Lucina <martin@lucina.net>2012-01-23 09:00:28 +0100
commit4016b657973bba87caf75168ba70aaa85d556487 (patch)
treec2abaf9284f55964bea72a0b76f6b79070335858 /src/ip.cpp
parent978e33ba253a997b41b331b449b474a5cee7bccc (diff)
Imported Upstream version 2.1.11upstream/2.1.11
Diffstat (limited to 'src/ip.cpp')
-rw-r--r--src/ip.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ip.cpp b/src/ip.cpp
index 206f0e9..7ef698b 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -102,7 +102,7 @@ static int resolve_nic_name (in_addr* addr_, char const *interface_)
return 0;
}
-#elif defined ZMQ_HAVE_AIX || ZMQ_HAVE_HPUX || ZMQ_HAVE_ANDROID
+#elif defined ZMQ_HAVE_AIX || defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_ANDROID
#include <sys/ioctl.h>
#include <net/if.h>
@@ -188,7 +188,7 @@ int zmq::open_socket (int domain_, int type_, int protocol_)
{
// Setting this option result in sane behaviour when exec() functions
// are used. Old sockets are closed and don't block TCP ports etc.
-#if defined SOCK_CLOEXEC
+#if defined HAVE_SOCK_CLOEXEC
type_ |= SOCK_CLOEXEC;
#endif
@@ -199,7 +199,7 @@ int zmq::open_socket (int domain_, int type_, int protocol_)
// If there's no SOCK_CLOEXEC, let's try the second best option. Note that
// race condition can cause socket not to be closed (if fork happens
// between socket creation and this point).
-#if !defined SOCK_CLOEXEC && defined FD_CLOEXEC
+#if !defined HAVE_SOCK_CLOEXEC && defined FD_CLOEXEC
int rc = fcntl (s, F_SETFD, FD_CLOEXEC);
errno_assert (rc != -1);
#endif