summaryrefslogtreecommitdiff
path: root/src/devpoll.cpp
diff options
context:
space:
mode:
authormalosek <malosek@fastmq.com>2009-09-08 16:55:03 +0200
committermalosek <malosek@fastmq.com>2009-09-08 16:55:03 +0200
commit734a62c12d2e2fb009ccf97d7d188060a474cc17 (patch)
treecbbb565d25dc7432c62d87641f5e0b9b143d94b2 /src/devpoll.cpp
parent844b590b5e348d8513ed574f6548cc0be41574af (diff)
Sparc solaris port
Diffstat (limited to 'src/devpoll.cpp')
-rw-r--r--src/devpoll.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/devpoll.cpp b/src/devpoll.cpp
index b7d153c..ac5c72f 100644
--- a/src/devpoll.cpp
+++ b/src/devpoll.cpp
@@ -30,10 +30,12 @@
#include <fcntl.h>
#include <unistd.h>
#include <limits.h>
+#include <algorithm>
#include "devpoll.hpp"
#include "err.hpp"
#include "config.hpp"
+#include "i_poll_events.hpp"
zmq::devpoll_t::devpoll_t ()
{
@@ -156,11 +158,11 @@ void zmq::devpoll_t::stop ()
stopping = true;
}
-bool zmq::devpoll_t::loop ()
+void zmq::devpoll_t::loop ()
{
// According to the poll(7d) man page, we can retrieve
// no more then (OPEN_MAX - 1) events.
- int nfds = std::min (max_io_events, OPEN_MAX - 1);
+ int nfds = std::min ((int) max_io_events, OPEN_MAX - 1);
while (!stopping) {