summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-08-18 11:24:14 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-08-18 11:24:14 +0200
commit4a8dd1e404c78fb403763d830190755d2ac83228 (patch)
tree36a4b8b93894a74f22f921eef5c9bd6ebc6cdbb6
parentb01a8e17511b57191c4aec4d741bdf3b3a80efc6 (diff)
MSVC build fixed
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--builds/msvc/libzmq/libzmq.vcproj8
-rw-r--r--src/ipc_address.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index 967043c..0a6bb49 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -295,6 +295,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\ipc_address.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\ipc_connecter.cpp"
>
</File>
@@ -553,6 +557,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\ipc_address.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\ipc_connecter.hpp"
>
</File>
diff --git a/src/ipc_address.cpp b/src/ipc_address.cpp
index f7252c5..6a471a6 100644
--- a/src/ipc_address.cpp
+++ b/src/ipc_address.cpp
@@ -20,7 +20,7 @@
#include "ipc_address.hpp"
-#if !defined ZMQ_HAVE_WINDOWS || !defined ZMQ_HAVE_OPENVMS
+#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
#include "err.hpp"