summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-07-22 08:35:01 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-07-22 08:35:01 +0200
commit5650743d9edc8b8e85739ab023e8156b451003f1 (patch)
treedbded93734c5aed7e8bf958664a82f2b73ce94cd
parent75c4e0e62be6bd34fb934b9f13de68ffd655c500 (diff)
MSVC build brought up to date
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--builds/msvc/libzmq/libzmq.vcproj36
-rw-r--r--src/zmq.cpp2
2 files changed, 1 insertions, 37 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index 1f841c2..7713f5f 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -251,10 +251,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\command.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\connect_session.cpp"
>
</File>
@@ -263,10 +259,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\dealer.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\decoder.cpp"
>
</File>
@@ -327,10 +319,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\named_session.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\object.cpp"
>
</File>
@@ -447,10 +435,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\uuid.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\xpub.cpp"
>
</File>
@@ -479,10 +463,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\zmq_init.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\zmq_listener.cpp"
>
</File>
@@ -533,10 +513,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\dealer.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\decoder.hpp"
>
</File>
@@ -617,10 +593,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\named_session.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\object.hpp"
>
</File>
@@ -753,10 +725,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\uuid.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\windows.hpp"
>
</File>
@@ -797,10 +765,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\zmq_init.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\zmq_listener.hpp"
>
</File>
diff --git a/src/zmq.cpp b/src/zmq.cpp
index f6786af..39d5404 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -43,7 +43,7 @@
#include <poll.h>
#endif
-#if defined WINDOWS
+#if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp"
#else
#include <unistd.h>