summaryrefslogtreecommitdiff
path: root/include/zmq.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/zmq.h')
-rw-r--r--include/zmq.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/zmq.h b/include/zmq.h
index efa3edb..910e381 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -32,8 +32,8 @@ extern "C" {
/* Version macros */
#define ZMQ_VERSION_MAJOR 2
-#define ZMQ_VERSION_MINOR 0
-#define ZMQ_VERSION_PATCH 10
+#define ZMQ_VERSION_MINOR 1
+#define ZMQ_VERSION_PATCH 0
#define ZMQ_MAKE_VERSION(major, minor, patch) \
(major * 10000 + minor * 100 + patch)
@@ -92,10 +92,10 @@ ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
#endif
/* Native 0MQ error codes. */
-#define EMTHREAD (ZMQ_HAUSNUMERO + 50)
#define EFSM (ZMQ_HAUSNUMERO + 51)
#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
#define ETERM (ZMQ_HAUSNUMERO + 53)
+#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
/* This function retrieves the errno as it is known to 0MQ library. The goal */
/* of this function is to make the code 100% portable, including where 0MQ */
@@ -187,6 +187,9 @@ ZMQ_EXPORT int zmq_term (void *context);
#define ZMQ_SNDBUF 11
#define ZMQ_RCVBUF 12
#define ZMQ_RCVMORE 13
+#define ZMQ_FD 14
+#define ZMQ_EVENTS 15
+#define ZMQ_TYPE 16
/* Send/recv options. */
#define ZMQ_NOBLOCK 1
@@ -235,8 +238,6 @@ ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
ZMQ_EXPORT int zmq_device (int device, void * insocket, void* outsocket);
-#undef ZMQ_EXPORT
-
#ifdef __cplusplus
}
#endif