Merge branch 'master' of github.com:zeromq/libzmq

builds/msvc/libzmq/libzmq.vcproj

@@ -410,6 +410,10 @@
 				RelativePath="..\..\..\src\session.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\signaler.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\socket_base.cpp"
 				>
@@ -568,10 +572,6 @@
 				RelativePath="..\..\..\src\i_engine.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\i_inout.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\i_poll_events.hpp"
 				>
@@ -712,6 +712,10 @@
 				RelativePath="..\..\..\src\session.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\signaler.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\socket_base.hpp"
 				>

src/signaler.cpp

@@ -134,7 +134,7 @@ void zmq::signaler_t::send ()
     errno_assert (sz == sizeof (inc));
 #elif defined ZMQ_HAVE_WINDOWS
     unsigned char dummy = 0;
-    int nbytes = ::send (w, &dummy, sizeof (dummy), 0);
+    int nbytes = ::send (w, (char*) &dummy, sizeof (dummy), 0);
     wsa_assert (nbytes != SOCKET_ERROR);
     zmq_assert (nbytes == sizeof (dummy));
 #else
@@ -219,8 +219,8 @@ void zmq::signaler_t::recv ()
     zmq_assert (dummy == 1);
 #else
     unsigned char dummy;
-#if ZMQ_HAVE_WINDOWS
-    int nbytes = ::recv (r, &dummy, sizeof (dummy), 0);
+#if defined ZMQ_HAVE_WINDOWS
+    int nbytes = ::recv (r, (char*) &dummy, sizeof (dummy), 0);
     wsa_assert (nbytes != SOCKET_ERROR);
 #else
     ssize_t nbytes = ::recv (r, &dummy, sizeof (dummy), 0);