generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-07 09:48:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix MSVC build

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2011-07-03 14:11:33 +02:00
parent da26134aa6
commit c687c7e61e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builds/msvc/libzmq/libzmq.vcproj
View File

@ -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 @@
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 @@
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"
> >

6
src/signaler.cpp
View File

@ -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 ()
{ {
// 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);