diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2011-11-04 09:48:25 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2011-11-04 09:48:25 +0100 |
| commit | 05ce301f3571e3e690792a189cb927328163f0bc (patch) | |
| tree | 1145b921033a2b88e9b987ec1d3e03060559702d /include | |
| parent | a8362abf11b51dd553766fb07a9e60f28e788126 (diff) | |
| parent | 6cdd720400ea456ccbfdf09cdc5054ab07dbdc6f (diff) | |
Merge branch 'master' of github.com:zeromq/libzmq
Diffstat (limited to 'include')
| -rw-r--r-- | include/zmq.h | 13 | ||||
| -rw-r--r-- | include/zmq_utils.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/zmq.h b/include/zmq.h index e236b2a..09ed89c 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -1,5 +1,7 @@ /* - Copyright (c) 2007-2011 iMatix Corporation + Copyright (c) 2009-2011 250bpm s.r.o. + Copyright (c) 2007-2010 iMatix Corporation + Copyright (c) 2011 VMware, Inc. Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file This file is part of 0MQ. @@ -162,10 +164,13 @@ ZMQ_EXPORT int zmq_term (void *context); #define ZMQ_PUSH 8 #define ZMQ_XPUB 9 #define ZMQ_XSUB 10 -#define ZMQ_ROUTER 13 + +#define ZMQ_ROUTER ZMQ_XREP +#define ZMQ_DEALER ZMQ_XREQ /* Socket options. */ #define ZMQ_AFFINITY 4 +#define ZMQ_IDENTITY 5 #define ZMQ_SUBSCRIBE 6 #define ZMQ_UNSUBSCRIBE 7 #define ZMQ_RATE 8 @@ -186,15 +191,11 @@ ZMQ_EXPORT int zmq_term (void *context); #define ZMQ_MULTICAST_HOPS 25 #define ZMQ_RCVTIMEO 27 #define ZMQ_SNDTIMEO 28 -#define ZMQ_RCVLABEL 29 -#define ZMQ_RCVCMD 30 #define ZMQ_IPV4ONLY 31 /* Send/recv options. */ #define ZMQ_DONTWAIT 1 #define ZMQ_SNDMORE 2 -#define ZMQ_SNDLABEL 4 -#define ZMQ_SNDCMD 8 ZMQ_EXPORT void *zmq_socket (void *context, int type); ZMQ_EXPORT int zmq_close (void *s); diff --git a/include/zmq_utils.h b/include/zmq_utils.h index 6d8a458..341d639 100644 --- a/include/zmq_utils.h +++ b/include/zmq_utils.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2011 iMatix Corporation + Copyright (c) 2009-2011 250bpm s.r.o. Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file This file is part of 0MQ. |