remove poller field, using fd instead

include/zmq.h

@@ -405,7 +405,6 @@ typedef struct zmq_pollitem_t
 #endif
     short events;
     short revents;
-    void *poller;
 } zmq_pollitem_t;
 
 #define ZMQ_POLLITEMS_DFLT 16
@@ -414,6 +413,12 @@ ZMQ_EXPORT int  zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
 ZMQ_EXPORT void *zmq_poller_new ();
 ZMQ_EXPORT int  zmq_poller_close (void *p);
 
+#if defined _WIN32
+ZMQ_EXPORT SOCKET zmq_poller_fd (void *p);
+#else
+ZMQ_EXPORT int    zmq_poller_fd (void *p);
+#endif
+ 
 /******************************************************************************/
 /*  Message proxying                                                          */
 /******************************************************************************/

src/zmq.cpp

@@ -727,8 +727,11 @@ int zmq_poller_close (void* p)
 }
 
 // Get poller fd
-
-zmq::fd_t zmq_poller_get_fd (void *p)
+#if defined _WIN32
+SOCKET zmq_poller_fd (void *p)
+#else
+int    zmq_poller_fd (void *p)
+#endif
 {
     zmq::signaler_t *s = (zmq::signaler_t*)p;
     return s->get_fd ();	
@@ -790,14 +793,14 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
             }
 
             if (thread_safe) {
-                if (!items_ [i].poller) {
+                if (!items_ [i].fd) {
                     if (pollfds != spollfds)
                         free (pollfds);
                     errno = EINVAL;
                     return -1;
                 }
 
-                pollfds [i].fd = zmq_poller_get_fd (items_ [i].poller);
+                pollfds [i].fd = items_ [i].fd;
             }
             else {
                 size_t zmq_fd_size = sizeof (zmq::fd_t);
@@ -974,12 +977,12 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
             zmq::fd_t notify_fd;
 
             if (thread_safe) {
-                if (!items_ [i].poller) {
+                if (!items_ [i].fd) {
                     errno = EINVAL;
                     return -1;
                 }
 
-                notify_fd = zmq_poller_get_fd (items_ [i].poller);
+                notify_fd = items_ [i].fd;
             }
             else {
                 size_t zmq_fd_size = sizeof (zmq::fd_t);

tests/test_thread_safe_polling.cpp

@@ -49,15 +49,9 @@ int main (void)
     rc = zmq_add_poller (server2, poller);
     assert (rc == 0);
 
-    zmq_pollitem_t items[2];
-
-    items[0].socket = server;
-    items[0].poller = poller;
-    items[0].events = ZMQ_POLLIN;
-
-    items[1].socket = server2;
-    items[1].poller = poller;
-    items[1].events = ZMQ_POLLIN;
+    zmq_pollitem_t items[] = {
+        {server,  zmq_poller_fd(poller), ZMQ_POLLIN, 0},
+        {server2, zmq_poller_fd(poller), ZMQ_POLLIN, 0}};
 
     rc = zmq_bind (server, "tcp://127.0.0.1:5560");
     assert (rc == 0);