diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-06-17 17:09:51 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-06-17 17:09:51 +0200 |
| commit | cff7ba2315c0f62fa3679afa24ecea88da38a365 (patch) | |
| tree | 2c55889c40fa4413a7d2d75ceafb0d3501f18462 | |
| parent | 7f01e9970d211235fc8057de6dc41ba8ceafe795 (diff) | |
Windows build fixed
| -rw-r--r-- | builds/msvc/c_local_lat/c_local_lat.vcproj | 4 | ||||
| -rw-r--r-- | builds/msvc/c_local_thr/c_local_thr.vcproj | 4 | ||||
| -rw-r--r-- | builds/msvc/c_remote_lat/c_remote_lat.vcproj | 4 | ||||
| -rw-r--r-- | builds/msvc/c_remote_thr/c_remote_thr.vcproj | 4 | ||||
| -rw-r--r-- | include/zmq_utils.h | 8 | ||||
| -rw-r--r-- | src/zmq.cpp | 1 |
6 files changed, 9 insertions, 16 deletions
diff --git a/builds/msvc/c_local_lat/c_local_lat.vcproj b/builds/msvc/c_local_lat/c_local_lat.vcproj index 5f7cdb2..a8d9a8d 100644 --- a/builds/msvc/c_local_lat/c_local_lat.vcproj +++ b/builds/msvc/c_local_lat/c_local_lat.vcproj @@ -166,10 +166,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\perf\helpers.cpp" - > - </File> - <File RelativePath="..\..\..\perf\local_lat.cpp" > </File> diff --git a/builds/msvc/c_local_thr/c_local_thr.vcproj b/builds/msvc/c_local_thr/c_local_thr.vcproj index 5d5b9b1..38425cc 100644 --- a/builds/msvc/c_local_thr/c_local_thr.vcproj +++ b/builds/msvc/c_local_thr/c_local_thr.vcproj @@ -166,10 +166,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\perf\helpers.cpp" - > - </File> - <File RelativePath="..\..\..\perf\local_thr.cpp" > </File> diff --git a/builds/msvc/c_remote_lat/c_remote_lat.vcproj b/builds/msvc/c_remote_lat/c_remote_lat.vcproj index 81e56a0..5bce7e9 100644 --- a/builds/msvc/c_remote_lat/c_remote_lat.vcproj +++ b/builds/msvc/c_remote_lat/c_remote_lat.vcproj @@ -166,10 +166,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\perf\helpers.cpp" - > - </File> - <File RelativePath="..\..\..\perf\remote_lat.cpp" > </File> diff --git a/builds/msvc/c_remote_thr/c_remote_thr.vcproj b/builds/msvc/c_remote_thr/c_remote_thr.vcproj index a1e465a..1089549 100644 --- a/builds/msvc/c_remote_thr/c_remote_thr.vcproj +++ b/builds/msvc/c_remote_thr/c_remote_thr.vcproj @@ -166,10 +166,6 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\..\perf\helpers.cpp" - > - </File> - <File RelativePath="..\..\..\perf\remote_thr.cpp" > </File> diff --git a/include/zmq_utils.h b/include/zmq_utils.h index 50a50f9..5b78e10 100644 --- a/include/zmq_utils.h +++ b/include/zmq_utils.h @@ -20,6 +20,10 @@ #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 @@ -46,4 +50,8 @@ ZMQ_EXPORT void zmq_sleep (int seconds_); #undef ZMQ_EXPORT +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/zmq.cpp b/src/zmq.cpp index 73a8d65..75e2e7f 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -18,6 +18,7 @@ */ #include "../include/zmq.h" +#include "../include/zmq_utils.h" #include <string.h> #include <errno.h> |