Imported Debian patch 2.0.9.dfsg-1debian/2.0.9.dfsg-1

2 files changed, 66 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
+
diff --git a/include/zmq_utils.h b/include/zmq_utils.h
new file mode 100644
index 0000000..5b78e10
--- /dev/null
+++ b/include/zmq_utils.h
@@ -0,0 +1,57 @@
+/*
+    Copyright (c) 2007-2010 iMatix Corporation
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the Lesser GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    Lesser GNU General Public License for more details.
+
+    You should have received a copy of the Lesser GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __ZMQ_UTILS_H_INCLUDED__
+#define __ZMQ_UTILS_H_INCLUDED__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*  Win32 needs special handling for DLL exports                              */
+#if defined _WIN32
+#   if defined DLL_EXPORT
+#       define ZMQ_EXPORT __declspec(dllexport)
+#   else
+#       define ZMQ_EXPORT __declspec(dllimport)
+#   endif
+#else
+#   define ZMQ_EXPORT
+#endif
+
+/*  Helper functions are used by perf tests so that they don't have to care   */
+/*  about minutiae of time-related functions on different OS platforms.       */
+
+/*  Starts the stopwatch. Returns the handle to the watch.                    */
+ZMQ_EXPORT void *zmq_stopwatch_start ();
+
+/*  Stops the stopwatch. Returns the number of microseconds elapsed since     */
+/*  the stopwatch was started.                                                */
+ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
+
+/*  Sleeps for specified number of seconds.                                   */
+ZMQ_EXPORT void zmq_sleep (int seconds_);
+
+#undef ZMQ_EXPORT
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif