summaryrefslogtreecommitdiff
path: root/bindings
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2010-01-04 15:46:20 +0100
committerMartin Sustrik <sustrik@fastmq.commkdir>2010-01-04 15:46:20 +0100
commitf2b235db165e459f7f265993477dae0dc987125a (patch)
tree4c51a044bb8a66d4787297540d78d88434632732 /bindings
parent7884f4541aa6f95b76e0b2429baaf11108c543a1 (diff)
ZMQII-29: Add timeout to zmq_poll function
Diffstat (limited to 'bindings')
-rw-r--r--bindings/c/zmq.h2
-rw-r--r--bindings/cpp/zmq.hpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h
index 7d3544e..7ad70e7 100644
--- a/bindings/c/zmq.h
+++ b/bindings/c/zmq.h
@@ -202,7 +202,7 @@ typedef struct
short revents;
} zmq_pollitem_t;
-ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems);
+ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
////////////////////////////////////////////////////////////////////////////////
// Helper functions.
diff --git a/bindings/cpp/zmq.hpp b/bindings/cpp/zmq.hpp
index 4349f0b..6d5bbab 100644
--- a/bindings/cpp/zmq.hpp
+++ b/bindings/cpp/zmq.hpp
@@ -33,9 +33,9 @@ namespace zmq
typedef zmq_free_fn free_fn;
typedef zmq_pollitem_t pollitem_t;
- inline int poll (zmq_pollitem_t *items_, int nitems_)
+ inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1)
{
- return zmq_poll (items_, nitems_);
+ return zmq_poll (items_, nitems_, timeout_);
}
class error_t : public std::exception