diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-05-09 16:59:15 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-05-09 16:59:15 +0200 |
| commit | a25414e55caa975185ac6534c40bb601e5c38a9a (patch) | |
| tree | 641094a5756a618b9bbdd40c68eba89cca67c34a /src | |
| parent | 4d33c43913dd640853cec75ce21080c2b33d8526 (diff) | |
Fix in zmq_poll (Windows version)
Diffstat (limited to 'src')
| -rw-r--r-- | src/zmq.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/zmq.cpp b/src/zmq.cpp index fb7a7f9..5f0b8ea 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -605,7 +605,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) memcpy (&inset, &pollset_in, sizeof (fd_set)); memcpy (&outset, &pollset_out, sizeof (fd_set)); memcpy (&errset, &pollset_err, sizeof (fd_set)); - int rc = select (maxfd, &inset, &outset, &errset, + rc = select (maxfd, &inset, &outset, &errset, block ? NULL : &timeout); #if defined ZMQ_HAVE_WINDOWS wsa_assert (rc != SOCKET_ERROR); |