From cbaa7cfa93893876e4fd8794b6ea39f4d245b6b5 Mon Sep 17 00:00:00 2001
From: Martin Lucina <martin@lucina.net>
Date: Mon, 23 Jan 2012 08:53:45 +0100
Subject: Imported Upstream version 2.1.6

---
 include/zmq.h   | 3 ++-
 include/zmq.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'include')

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                      */
diff --git a/include/zmq.hpp b/include/zmq.hpp
index d73c672..e147b0e 100644
--- a/include/zmq.hpp
+++ b/include/zmq.hpp
@@ -197,7 +197,7 @@ namespace zmq
         {
             return ptr;
         }
-        
+
     private:
 
         void *ptr;
-- 
cgit v1.2.3