Commit c687c7e6 authored by Martin Sustrik's avatar Martin Sustrik

Fix MSVC build

Signed-off-by: 's avatarMartin Sustrik <sustrik@250bpm.com>
parent da26134a
...@@ -410,6 +410,10 @@ ...@@ -410,6 +410,10 @@
RelativePath="..\..\..\src\session.cpp" RelativePath="..\..\..\src\session.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\signaler.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\socket_base.cpp" RelativePath="..\..\..\src\socket_base.cpp"
> >
...@@ -568,10 +572,6 @@ ...@@ -568,10 +572,6 @@
RelativePath="..\..\..\src\i_engine.hpp" RelativePath="..\..\..\src\i_engine.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\i_inout.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\i_poll_events.hpp" RelativePath="..\..\..\src\i_poll_events.hpp"
> >
...@@ -712,6 +712,10 @@ ...@@ -712,6 +712,10 @@
RelativePath="..\..\..\src\session.hpp" RelativePath="..\..\..\src\session.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\signaler.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\socket_base.hpp" RelativePath="..\..\..\src\socket_base.hpp"
> >
......
...@@ -120,7 +120,7 @@ void zmq::signaler_t::send () ...@@ -120,7 +120,7 @@ void zmq::signaler_t::send ()
{ {
#if defined ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
unsigned char dummy = 0; 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); wsa_assert (nbytes != SOCKET_ERROR);
zmq_assert (nbytes == sizeof (dummy)); zmq_assert (nbytes == sizeof (dummy));
#else #else
...@@ -189,8 +189,8 @@ void zmq::signaler_t::recv () ...@@ -189,8 +189,8 @@ void zmq::signaler_t::recv ()
{ {
// Attempt to read a signal. // Attempt to read a signal.
unsigned char dummy; unsigned char dummy;
#if ZMQ_HAVE_WINDOWS #if defined ZMQ_HAVE_WINDOWS
int nbytes = ::recv (r, &dummy, sizeof (dummy), 0); int nbytes = ::recv (r, (char*) &dummy, sizeof (dummy), 0);
wsa_assert (nbytes != SOCKET_ERROR); wsa_assert (nbytes != SOCKET_ERROR);
#else #else
ssize_t nbytes = ::recv (r, &dummy, sizeof (dummy), 0); ssize_t nbytes = ::recv (r, &dummy, sizeof (dummy), 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment