Merge branch 'master' into events

This commit is contained in:
Lourens Naudé
2012-05-04 02:35:22 +01:00
9 changed files with 94 additions and 42 deletions

View File

@@ -193,6 +193,13 @@ int zmq::ipc_connecter_t::open ()
// Connect was successfull immediately.
if (rc == 0)
return 0;
// Translate other error codes indicating asynchronous connect has been
// launched to a uniform EINPROGRESS.
if (rc == -1 && errno == EINTR) {
errno = EINPROGRESS;
return -1;
}
// Forward the error.
return -1;