3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Arsenault 2012-12-30 17:58:27 -05:00 committed by Matt Arsenault
parent 1eee9ce035
commit 73c370dd17
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ip.cpp
View File

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

2
src/zmq.cpp
View File

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