Commit 90c76fbd authored by Luca Boccassi's avatar Luca Boccassi

Problem: new zmq_poller used by zmq_poll without DRAFTs

Solution: do not define ZMQ_HAVE_POLLER in src/zmq_drafts.h otherwise
src/zmq.cpp will implement zmq_poll using the new poller classes.
Same for ZMQ_HAVE_TIMERS, even though it has no internal effect, but
to be safe against future development.
parent e905f9da
...@@ -67,8 +67,6 @@ const char *zmq_msg_group(zmq_msg_t *msg); ...@@ -67,8 +67,6 @@ const char *zmq_msg_group(zmq_msg_t *msg);
/* Poller polling on sockets,fd and thread-safe sockets */ /* Poller polling on sockets,fd and thread-safe sockets */
/******************************************************************************/ /******************************************************************************/
#define ZMQ_HAVE_POLLER
typedef struct zmq_poller_event_t typedef struct zmq_poller_event_t
{ {
void *socket; void *socket;
...@@ -103,8 +101,6 @@ int zmq_poller_remove_fd (void *poller, int fd); ...@@ -103,8 +101,6 @@ int zmq_poller_remove_fd (void *poller, int fd);
/* Scheduling timers */ /* Scheduling timers */
/******************************************************************************/ /******************************************************************************/
#define ZMQ_HAVE_TIMERS
typedef void (zmq_timer_fn)(int timer_id, void *arg); typedef void (zmq_timer_fn)(int timer_id, void *arg);
void *zmq_timers_new (void); void *zmq_timers_new (void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment