Merge pull request #1181 from whoshuu/patch-1

Fix non-constant-expression narrowing

Merge pull request #1181 from whoshuu/patch-1
Fix non-constant-expression narrowing
19712d3f · Martin Hurton · 4b70793f · 5642366f · 19712d3f
Commit 19712d3f authored Sep 16, 2014 by Martin Hurton
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -163,8 +163,12 @@ void zmq::select_t::loop ()
        memcpy (&exceptfds, &source_set_err, sizeof source_set_err);

        //  Wait for events.
+#ifdef ZMQ_HAVE_OSX
+        struct timeval tv = {(long) (timeout / 1000), timeout % 1000 * 1000};
+#else
        struct timeval tv = {(long) (timeout / 1000),
            (long) (timeout % 1000 * 1000)};
+#endif
 #ifdef ZMQ_HAVE_WINDOWS
        int rc = select (0, &readfds, &writefds, &exceptfds,
            timeout ? &tv : NULL);