diff options
| author | Martin Lucina <mato@kotelna.sk> | 2011-03-28 10:39:51 +0200 |
|---|---|---|
| committer | Martin Lucina <martin@lucina.net> | 2012-01-23 08:53:37 +0100 |
| commit | 3e20cb1b8a2b1ca222011df37334e5f4f88dd565 (patch) | |
| tree | 4a753775186bc7f583f1ceb3f9aa675b6f110596 /include/zmq_utils.h | |
| parent | 3f0085ddbef1a44b6bb7a0b23af497d56e0025fa (diff) | |
| parent | e645fc2693acc796304498909786b7b47005b429 (diff) | |
Imported Debian patch 2.1.3-1debian/2.1.3-1
Diffstat (limited to 'include/zmq_utils.h')
| -rw-r--r-- | include/zmq_utils.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/include/zmq_utils.h b/include/zmq_utils.h index 5b78e10..6d8a458 100644 --- a/include/zmq_utils.h +++ b/include/zmq_utils.h @@ -1,19 +1,20 @@ /* - Copyright (c) 2007-2010 iMatix Corporation + Copyright (c) 2007-2011 iMatix Corporation + Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file 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 terms of the GNU Lesser 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. + GNU Lesser General Public License for more details. - You should have received a copy of the Lesser GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -24,7 +25,7 @@ extern "C" { #endif -/* Win32 needs special handling for DLL exports */ +/* Handle DSO symbol visibility */ #if defined _WIN32 # if defined DLL_EXPORT # define ZMQ_EXPORT __declspec(dllexport) @@ -32,14 +33,20 @@ extern "C" { # define ZMQ_EXPORT __declspec(dllimport) # endif #else -# define ZMQ_EXPORT +# if defined __SUNPRO_C || defined __SUNPRO_CC +# define ZMQ_EXPORT __global +# elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER +# define ZMQ_EXPORT __attribute__ ((visibility("default"))) +# else +# define ZMQ_EXPORT +# endif #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 (); +ZMQ_EXPORT void *zmq_stopwatch_start (void); /* Stops the stopwatch. Returns the number of microseconds elapsed since */ /* the stopwatch was started. */ |