>From 5650743d9edc8b8e85739ab023e8156b451003f1 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <[email protected]>
Date: Fri, 22 Jul 2011 08:35:01 +0200
Subject: [PATCH] MSVC build brought up to date

Signed-off-by: Martin Sustrik <[email protected]>
---
 builds/msvc/libzmq/libzmq.vcproj |   36 ------------------------------------
 src/zmq.cpp                      |    2 +-
 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>
-- 
1.6.5.1.1367.gcd48

_______________________________________________
zeromq-dev mailing list
[email protected]
http://lists.zeromq.org/mailman/listinfo/zeromq-dev

Reply via email to