Merge branch 'master' of git@github.com:sustrik/zeromq2

builds/msvc/libzmq/libzmq.vcproj

@@ -197,6 +197,10 @@
 				RelativePath="..\..\..\src\fd_signaler.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\fq.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\io_object.cpp"
 				>
@@ -213,6 +217,10 @@
 				RelativePath="..\..\..\src\kqueue.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lb.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\object.cpp"
 				>
@@ -411,6 +419,10 @@
 				RelativePath="..\..\..\src\fd_signaler.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\fq.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\i_endpoint.hpp"
 				>
@@ -451,6 +463,10 @@
 				RelativePath="..\..\..\src\kqueue.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\lb.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\msg_content.hpp"
 				>

src/zmq_listener_init.cpp

@@ -121,6 +121,7 @@ class zmq::socket_base_t *zmq::zmq_listener_init_t::get_owner ()
 const char *zmq::zmq_listener_init_t::get_session_name ()
 {
     zmq_assert (false);
+    return NULL;
 }
 
 void zmq::zmq_listener_init_t::process_plug ()