summaryrefslogtreecommitdiff
path: root/include/zmq.h
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2011-05-09 11:20:08 +0200
committerMartin Lucina <martin@lucina.net>2012-01-23 08:53:47 +0100
commitf34d1599a651dd0b8feba2397f87629733988384 (patch)
tree07694c4ed96bf7b0ecadebc76d6da3f6c0125219 /include/zmq.h
parent8eea9178e40abf16c0e469465a58fba3beaaf754 (diff)
parentcbaa7cfa93893876e4fd8794b6ea39f4d245b6b5 (diff)
Imported Debian patch 2.1.6-1debian/2.1.6-1
Diffstat (limited to 'include/zmq.h')
-rw-r--r--include/zmq.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/zmq.h b/include/zmq.h
index 6cb61b1..a7b20b3 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -55,7 +55,7 @@ extern "C" {
/* Version macros for compile-time API version detection */
#define ZMQ_VERSION_MAJOR 2
#define ZMQ_VERSION_MINOR 1
-#define ZMQ_VERSION_PATCH 4
+#define ZMQ_VERSION_PATCH 6
#define ZMQ_MAKE_VERSION(major, minor, patch) \
((major) * 10000 + (minor) * 100 + (patch))
@@ -134,6 +134,7 @@ ZMQ_EXPORT const char *zmq_strerror (int errnum);
/* allows us to pack the stucture tigher and thus improve performance. */
#define ZMQ_MSG_MORE 1
#define ZMQ_MSG_SHARED 128
+#define ZMQ_MSG_MASK 129 /* Merges all the flags */
/* A message. Note that 'content' is not a pointer to the raw data. */
/* Rather it is pointer to zmq::msg_content_t structure */