diff options
| author | Martin Lucina <martin@lucina.net> | 2012-01-23 08:53:25 +0100 |
|---|---|---|
| committer | Martin Lucina <martin@lucina.net> | 2012-01-23 08:53:25 +0100 |
| commit | 5ba1cb20fe6f6699cef1cc726718e760cd4c9af1 (patch) | |
| tree | df7b144c5325fd8b3c88c49b456fafc24249abe6 /include/zmq.h | |
| parent | a15854bd92db69fcd0b4444fe1b8fe3610a7acf6 (diff) | |
Imported Upstream version 2.0.9.dfsgupstream/2.0.9.dfsg
Diffstat (limited to 'include/zmq.h')
| -rw-r--r-- | include/zmq.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/zmq.h b/include/zmq.h index 3bf55b6..90a73c2 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -42,13 +42,13 @@ extern "C" { #endif /******************************************************************************/ -/* 0MQ versioning support. */ +/* 0MQ versioning support. */ /******************************************************************************/ ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch); /******************************************************************************/ -// 0MQ errors. +/* 0MQ errors. */ /******************************************************************************/ /* A number random anough not to collide with different errno ranges on */ @@ -159,8 +159,10 @@ ZMQ_EXPORT int zmq_term (void *context); #define ZMQ_REP 4 #define ZMQ_XREQ 5 #define ZMQ_XREP 6 -#define ZMQ_UPSTREAM 7 -#define ZMQ_DOWNSTREAM 8 +#define ZMQ_PULL 7 +#define ZMQ_PUSH 8 +#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 @@ -223,8 +225,11 @@ 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 #endif + |