summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-07-03 14:11:33 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-07-03 14:11:33 +0200
commitc687c7e61e8519c93eb4bc7ef43c5cf63671eb3e (patch)
treead1c8c78ae7380acdfb5d0587d4173c20041da85
parentda26134aa696352de6e77a800a433878dbabb7fa (diff)
Fix MSVC build
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-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 2ecfb98..a511530 100644
--- 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);