generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-22 23:11:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:zeromq/libzmq

Browse Source
This commit is contained in:
Martin Sustrik 2011-07-03 15:33:25 +02:00
commit 8fb9d3c6d0
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"
>
</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"
>

6
src/signaler.cpp
View File

@ -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);