Merge pull request #1526 from somdoron/master

problem: new field is breaking existing code
This commit is contained in:
taotetek 2015-08-16 11:09:28 -04:00
commit eb1d72f81d

View File

@ -398,7 +398,6 @@ ZMQ_EXPORT int zmq_remove_poller (void *s, void *p);
typedef struct zmq_pollitem_t typedef struct zmq_pollitem_t
{ {
void *socket; void *socket;
void *poller;
#if defined _WIN32 #if defined _WIN32
SOCKET fd; SOCKET fd;
#else #else
@ -406,6 +405,7 @@ typedef struct zmq_pollitem_t
#endif #endif
short events; short events;
short revents; short revents;
void *poller;
} zmq_pollitem_t; } zmq_pollitem_t;
#define ZMQ_POLLITEMS_DFLT 16 #define ZMQ_POLLITEMS_DFLT 16