From c97967ed4b70de700db38cc2661bbe43262bc029 Mon Sep 17 00:00:00 2001
From: unknown <bundra@.(none)>
Date: Mon, 28 Dec 2009 16:20:21 +0100
Subject: MSVC build fixed

---
 builds/msvc/libzmq/libzmq.vcproj | 16 ++++------------
 src/zmq_init.cpp                 |  1 +
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index 30b853a..30de948 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -329,10 +329,6 @@
 				RelativePath="..\..\..\src\zmq_connecter.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\zmq_connecter_init.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\zmq_decoder.cpp"
 				>
@@ -346,11 +342,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_listener.cpp"
+				RelativePath="..\..\..\src\zmq_init.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_listener_init.cpp"
+				RelativePath="..\..\..\src\zmq_listener.cpp"
 				>
 			</File>
 		</Filter>
@@ -607,10 +603,6 @@
 				RelativePath="..\..\..\src\zmq_connecter.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\zmq_connecter_init.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\zmq_decoder.hpp"
 				>
@@ -624,11 +616,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_listener.hpp"
+				RelativePath="..\..\..\src\zmq_init.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_listener_init.hpp"
+				RelativePath="..\..\..\src\zmq_listener.hpp"
 				>
 			</File>
 		</Filter>
diff --git a/src/zmq_init.cpp b/src/zmq_init.cpp
index e526b34..416e733 100644
--- a/src/zmq_init.cpp
+++ b/src/zmq_init.cpp
@@ -119,6 +119,7 @@ class zmq::socket_base_t *zmq::zmq_init_t::get_owner ()
 uint64_t zmq::zmq_init_t::get_ordinal ()
 {
     zmq_assert (false);
+    return 0;
 }
 
 void zmq::zmq_init_t::process_plug ()
-- 
cgit v1.2.3