Fix MSVC build

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
tj · Jul 3, 2011 · c687c7e · c687c7e
1 parent da26134
commit c687c7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/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"
 				>

diff --git a/src/signaler.cpp b/src/signaler.cpp
@@ -120,7 +120,7 @@ void zmq::signaler_t::send ()
 {
 #if 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
@@ -189,8 +189,8 @@ void zmq::signaler_t::recv ()
 {
     //  Attempt to read a signal.
     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);