From abb184a051b592b6d4c99fd3299e78ea7c1da826 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Sat, 26 Mar 2011 10:38:40 +0100 Subject: ZMQ_NOBLOCK renamed ZMQ_DONTWAIT Done because of POSIX compliance Signed-off-by: Martin Sustrik --- src/socket_base.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/socket_base.cpp') diff --git a/src/socket_base.cpp b/src/socket_base.cpp index bf873b6..b1d1142 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -478,7 +478,7 @@ int zmq::socket_base_t::send (::zmq_msg_t *msg_, int flags_) // In case of non-blocking send we'll simply propagate // the error - including EAGAIN - upwards. - if (flags_ & ZMQ_NOBLOCK) + if (flags_ & ZMQ_DONTWAIT) return -1; // Oops, we couldn't send the message. Wait for the next @@ -533,7 +533,7 @@ int zmq::socket_base_t::recv (::zmq_msg_t *msg_, int flags_) // For non-blocking recv, commands are processed in case there's an // activate_reader command already waiting int a command pipe. // If it's not, return EAGAIN. - if (flags_ & ZMQ_NOBLOCK) { + if (flags_ & ZMQ_DONTWAIT) { if (errno != EAGAIN) return -1; if (unlikely (process_commands (false, false) != 0)) -- cgit v1.2.3