diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-04-15 07:32:49 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-04-15 07:32:49 +0200 |
| commit | 1c33941be9d564733c15fe0466906fdf0bbd46b8 (patch) | |
| tree | 9348422063498c3598624b6e60bf4de6180b661e /include | |
| parent | ea18d30c209cb4e3f0dd0bc5e4380345e81b6fb6 (diff) | |
| parent | 370cde09226d8a1b87eeac306fe97d64b4ea63a3 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'include')
| -rw-r--r-- | include/zmq.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/zmq.h b/include/zmq.h index 47d8359..a7638aa 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -30,13 +30,15 @@ extern "C" { #include "winsock2.h" #endif -/* Microsoft Visual Studio uses non-standard way to export/import symbols. */ -#if defined ZMQ_BUILDING_LIBZMQ_WITH_MSVC -#define ZMQ_EXPORT __declspec(dllexport) -#elif defined _MSC_VER -#define ZMQ_EXPORT __declspec(dllimport) +/* 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 +# define ZMQ_EXPORT #endif /******************************************************************************/ |