Commit eb1d72f8 authored by taotetek's avatar taotetek

Merge pull request #1526 from somdoron/master

problem: new field is breaking existing code
parents e74e36de 9d829f72
...@@ -397,8 +397,7 @@ ZMQ_EXPORT int zmq_remove_poller (void *s, void *p); ...@@ -397,8 +397,7 @@ 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 ...@@ -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
......
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