summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-04 17:19:38 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-04 17:19:38 +0200
commit76f2e5d5442d3200c8ca09681a887830775c84c0 (patch)
tree5de219c76d701b5d58643f35a8090ea9086db0d3
parentca176121deb8dbdc62d8a37fec377c07fc786480 (diff)
parentdb7fe858d6356988fb9a9270c235178e523b2370 (diff)
Merge branch 'maint'
* maint: Broken device numbering reverted assert on malformed messages forwarder and streamer devices handle multi-part messages correctly improved null checking in zmq_term Conflicts: AUTHORS include/zmq.h src/zmq.cpp
-rw-r--r--include/zmq.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/zmq.h b/include/zmq.h
index 26c6a1e..07292cf 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -160,10 +160,8 @@ ZMQ_EXPORT int zmq_term (void *context);
#define ZMQ_XREP 6
#define ZMQ_PULL 7
#define ZMQ_PUSH 8
-
-/* Deprecated aliases, to be removed in release 3.x */
-#define ZMQ_UPSTREAM ZMQ_PULL
-#define ZMQ_DOWNSTREAM ZMQ_PUSH
+#define ZMQ_UPSTREAM ZMQ_PULL /* Old alias, remove in 3.x */
+#define ZMQ_DOWNSTREAM ZMQ_PUSH /* Old alias, remove in 3.x */
/* Socket options. */
#define ZMQ_HWM 1
@@ -233,3 +231,4 @@ ZMQ_EXPORT int zmq_device (int device, void * insocket, void* outsocket);
#endif
#endif
+