Merge pull request #2813 from AntonBarwald/master

Problem: Sometimes on OSX we get ETIMEDOUT instead of EAGAIN

Merge pull request #2813 from AntonBarwald/master
Problem: Sometimes on OSX we get ETIMEDOUT instead of EAGAIN
b3d19ffe · Simon Giesecke · GitHub · 812e7562 · 630f6d6a · b3d19ffe
Unverified Commit b3d19ffe authored Nov 02, 2017 by Simon Giesecke Committed by GitHub Nov 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

socket_poller.cpp src/socket_poller.cpp +4 -0

No files found.
--- a/src/socket_poller.cpp
+++ b/src/socket_poller.cpp
@@ -553,6 +553,10 @@ int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_,
 #elif defined ZMQ_HAVE_ANDROID
        usleep (timeout_ * 1000);
        return -1;
+#elif defined ZMQ_HAVE_OSX
+        usleep (timeout_ * 1000);
+        errno = EAGAIN;
+        return -1;
 #else
        usleep (timeout_ * 1000);
        return -1;