diff options
| author | Martin Lucina <mato@kotelna.sk> | 2010-04-12 16:49:13 +0200 |
|---|---|---|
| committer | Martin Lucina <mato@kotelna.sk> | 2010-04-12 16:49:13 +0200 |
| commit | 0024d290765f53428ff78eddc5a4bc675a13c6a7 (patch) | |
| tree | af03ef61700fb8b232825ba68c10d8d4cf7a9154 /include/zmq.h | |
| parent | 34964769399825e45b3efd02e642af97355707ef (diff) | |
Build fixes for cross compiling and Win32
Diffstat (limited to 'include/zmq.h')
| -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 fc52584..d251ae8 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 /******************************************************************************/ |