diff --git a/lib/nodes/zeromq.c b/lib/nodes/zeromq.c index b9078b276..13e2356f1 100644 --- a/lib/nodes/zeromq.c +++ b/lib/nodes/zeromq.c @@ -36,7 +36,7 @@ static void *context; -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203 +#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3 /** Read one event off the monitor socket; return value and address * by reference, if not null, and event number by value. * @@ -345,7 +345,7 @@ int zeromq_start(struct node *n) goto fail; } -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203 +#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3 /* Monitor handshake events on the server */ ret = zmq_socket_monitor(z->in.socket, "inproc://monitor-server", ZMQ_EVENT_HANDSHAKE_SUCCEEDED | ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL | ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL | ZMQ_EVENT_HANDSHAKE_FAILED_AUTH); if (ret < 0) @@ -382,7 +382,7 @@ int zeromq_start(struct node *n) } } -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203 +#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3 if (z->curve.enabled) { ret = get_monitor_event(z->in.mon_socket, NULL, NULL); return ret == ZMQ_EVENT_HANDSHAKE_SUCCEEDED; @@ -408,7 +408,7 @@ int zeromq_stop(struct node *n) if (ret) return ret; -#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203 +#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3 ret = zmq_close(z->in.mon_socket); if (ret) return ret;