From d5f3628ad08849a0c978f7d23dc678133ed33c42 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Fri, 29 Jul 2011 09:37:43 +0200 Subject: Different connecters simplified Signed-off-by: Martin Sustrik --- src/signaler.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/signaler.cpp') 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 -#include -#include #include #include #include @@ -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 () -- cgit v1.2.3