Skip to content

L
libzmq
Commit 73c370dd authored by Matt Arsenault's avatar Matt Arsenault Committed by Matt Arsenault
Browse files
Options

Fix inconsistently using #if or #ifdef instead of #if defined

parent 1eee9ce0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/ip.cpp
View file @ 73c370dd
...@@ -73,11 +73,11 @@ zmq::fd_t zmq::open_socket (int domain_, int type_, int protocol_) ...@@ -73,11 +73,11 @@ zmq::fd_t zmq::open_socket (int domain_, int type_, int protocol_)
void zmq::unblock_socket (fd_t s_) void zmq::unblock_socket (fd_t s_)
{ {
#ifdef ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
u_long nonblock = 1; u_long nonblock = 1;
int rc = ioctlsocket (s_, FIONBIO, &nonblock); int rc = ioctlsocket (s_, FIONBIO, &nonblock);
wsa_assert (rc != SOCKET_ERROR); wsa_assert (rc != SOCKET_ERROR);
#elif ZMQ_HAVE_OPENVMS #elif defined ZMQ_HAVE_OPENVMS
int nonblock = 1; int nonblock = 1;
int rc = ioctl (s_, FIONBIO, &nonblock); int rc = ioctl (s_, FIONBIO, &nonblock);
errno_assert (rc != -1); errno_assert (rc != -1);
......
src/zmq.cpp
View file @ 73c370dd
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
// XSI vector I/O // XSI vector I/O
#if ZMQ_HAVE_UIO #if defined ZMQ_HAVE_UIO
#include <sys/uio.h> #include <sys/uio.h>
#else #else
struct iovec { struct iovec {
......
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