Merge pull request #2813 from AntonBarwald/master

Problem: Sometimes on OSX we get ETIMEDOUT instead of EAGAIN
This commit is contained in:
Simon Giesecke 2017-11-02 17:35:00 +01:00 committed by GitHub
commit b3d19ffe1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -553,6 +553,10 @@ int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_,
#elif defined ZMQ_HAVE_ANDROID #elif defined ZMQ_HAVE_ANDROID
usleep (timeout_ * 1000); usleep (timeout_ * 1000);
return -1; return -1;
#elif defined ZMQ_HAVE_OSX
usleep (timeout_ * 1000);
errno = EAGAIN;
return -1;
#else #else
usleep (timeout_ * 1000); usleep (timeout_ * 1000);
return -1; return -1;