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

builds/msvc/libzmq/libzmq.vcproj

@@ -197,10 +197,6 @@
 				RelativePath="..\..\..\src\err.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\fd_signaler.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\forwarder.cpp"
 				>
@@ -293,6 +289,10 @@
 				RelativePath="..\..\..\src\session.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\signaler.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\socket_base.cpp"
 				>
@@ -337,10 +337,6 @@
 				RelativePath="..\..\..\src\xreq.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\ypollset.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\zmq.cpp"
 				>
@@ -379,10 +375,6 @@
 				RelativePath="..\..\..\src\app_thread.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\atomic_bitmap.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\atomic_counter.hpp"
 				>
@@ -431,10 +423,6 @@
 				RelativePath="..\..\..\src\fd.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\fd_signaler.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\forwarder.hpp"
 				>
@@ -459,14 +447,6 @@
 				RelativePath="..\..\..\src\i_poll_events.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\i_poller.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\i_signaler.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\io_object.hpp"
 				>
@@ -564,7 +544,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\simple_semaphore.hpp"
+				RelativePath="..\..\..\src\signaler.hpp"
 				>
 			</File>
 			<File
@@ -627,10 +607,6 @@
 				RelativePath="..\..\..\src\ypipe.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\ypollset.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\yqueue.hpp"
 				>

src/signaler.cpp

@@ -150,7 +150,7 @@ void zmq::signaler_t::signal (uint32_t signal_)
 {
     //  TODO: Note that send is a blocking operation.
     //  How should we behave if the signal cannot be written to the signaler?
-    int rc = send (w, &signal_, sizeof (signal_), 0);
+    int rc = send (w, (char*) &signal_, sizeof (signal_), 0);
     win_assert (rc != SOCKET_ERROR);
     zmq_assert (rc == sizeof (signal_));
 }
@@ -171,8 +171,6 @@ void zmq::signaler_t::xpoll ()
     argp = 1;
     rc = ioctlsocket (r, FIONBIO, &argp);
     wsa_assert (rc != SOCKET_ERROR);
-
-    return signals;
 }
 
 void zmq::signaler_t::xcheck ()