Merge pull request #2554 from bluca/disable_new_poller_without_drafts

Problem: new zmq_poller used by zmq_poll without DRAFTs

src/zmq_draft.h

@@ -67,8 +67,6 @@ const char *zmq_msg_group(zmq_msg_t *msg);
 /*  Poller polling on sockets,fd and thread-safe sockets                      */
 /******************************************************************************/
 
-#define ZMQ_HAVE_POLLER
-
 typedef struct zmq_poller_event_t
 {
     void *socket;
@@ -103,8 +101,6 @@ int zmq_poller_remove_fd (void *poller, int fd);
 /*  Scheduling timers                                                         */
 /******************************************************************************/
 
-#define ZMQ_HAVE_TIMERS
-
 typedef void (zmq_timer_fn)(int timer_id, void *arg);
 
 void *zmq_timers_new (void);