summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builds/msvc/libzmq/libzmq.vcproj12
-rw-r--r--src/signaler.cpp6
2 files changed, 11 insertions, 7 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index 93961e3..1f841c2 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -411,6 +411,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\signaler.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\socket_base.cpp"
>
</File>
@@ -569,10 +573,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\i_inout.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\src\i_poll_events.hpp"
>
</File>
@@ -713,6 +713,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\signaler.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\socket_base.hpp"
>
</File>
diff --git a/src/signaler.cpp b/src/signaler.cpp
index fb72a07..8778d1a 100644
--- a/src/signaler.cpp
+++ b/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);