diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-07-29 09:37:43 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-07-29 09:37:43 +0200 |
commit | d5f3628ad08849a0c978f7d23dc678133ed33c42 (patch) | |
tree | de82260f962d25b4762497af8358bd6182feefb4 /src/signaler.cpp | |
parent | f63db009a1e1baf9f1fe7dae39901c7449c66131 (diff) |
Different connecters simplified
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/signaler.cpp')
-rw-r--r-- | src/signaler.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/signaler.cpp b/src/signaler.cpp index 57c7f55..1c1c5b6 100644 --- a/src/signaler.cpp +++ b/src/signaler.cpp @@ -71,8 +71,6 @@ #include "windows.hpp" #else #include <unistd.h> -#include <fcntl.h> -#include <limits.h> #include <netinet/tcp.h> #include <unistd.h> #include <sys/types.h> @@ -86,22 +84,8 @@ zmq::signaler_t::signaler_t () errno_assert (rc == 0); // Set both fds to non-blocking mode. -#if defined ZMQ_HAVE_WINDOWS - unsigned long argp = 1; - rc = ioctlsocket (w, FIONBIO, &argp); - wsa_assert (rc != SOCKET_ERROR); - rc = ioctlsocket (r, FIONBIO, &argp); - wsa_assert (rc != SOCKET_ERROR); -#else - int flags = fcntl (w, F_GETFL, 0); - errno_assert (flags >= 0); - rc = fcntl (w, F_SETFL, flags | O_NONBLOCK); - errno_assert (rc == 0); - flags = fcntl (r, F_GETFL, 0); - errno_assert (flags >= 0); - rc = fcntl (r, F_SETFL, flags | O_NONBLOCK); - errno_assert (rc == 0); -#endif + unblock_socket (w); + unblock_socket (r); } zmq::signaler_t::~signaler_t () |