diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-04-30 04:54:10 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-04-30 04:54:10 +0200 |
| commit | 4a6bac1deaedb3c111c7e28b2933ed98367cb193 (patch) | |
| tree | 06250b890595a4577587673c8a1c9756eec0433a | |
| parent | acfd0f8ca2d15111f35ae0034ed3ce130c96b910 (diff) | |
| parent | beb4da3c28cff501a33de34cec95ca110cd3084e (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
| -rw-r--r-- | builds/msvc/libzmq/libzmq.vcproj | 34 | ||||
| -rw-r--r-- | src/signaler.cpp | 4 |
2 files changed, 6 insertions, 32 deletions
diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj index ef44f20..219d757 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -198,10 +198,6 @@ > </File> <File - RelativePath="..\..\..\src\fd_signaler.cpp" - > - </File> - <File RelativePath="..\..\..\src\forwarder.cpp" > </File> @@ -294,6 +290,10 @@ > </File> <File + RelativePath="..\..\..\src\signaler.cpp" + > + </File> + <File RelativePath="..\..\..\src\socket_base.cpp" > </File> @@ -338,10 +338,6 @@ > </File> <File - RelativePath="..\..\..\src\ypollset.cpp" - > - </File> - <File RelativePath="..\..\..\src\zmq.cpp" > </File> @@ -380,10 +376,6 @@ > </File> <File - RelativePath="..\..\..\src\atomic_bitmap.hpp" - > - </File> - <File RelativePath="..\..\..\src\atomic_counter.hpp" > </File> @@ -432,10 +424,6 @@ > </File> <File - RelativePath="..\..\..\src\fd_signaler.hpp" - > - </File> - <File RelativePath="..\..\..\src\forwarder.hpp" > </File> @@ -460,14 +448,6 @@ > </File> <File - RelativePath="..\..\..\src\i_poller.hpp" - > - </File> - <File - RelativePath="..\..\..\src\i_signaler.hpp" - > - </File> - <File RelativePath="..\..\..\src\io_object.hpp" > </File> @@ -564,7 +544,7 @@ > </File> <File - RelativePath="..\..\..\src\simple_semaphore.hpp" + RelativePath="..\..\..\src\signaler.hpp" > </File> <File @@ -628,10 +608,6 @@ > </File> <File - RelativePath="..\..\..\src\ypollset.hpp" - > - </File> - <File RelativePath="..\..\..\src\yqueue.hpp" > </File> diff --git a/src/signaler.cpp b/src/signaler.cpp index 2d89eca..e1fa6a3 100644 --- a/src/signaler.cpp +++ b/src/signaler.cpp @@ -150,7 +150,7 @@ void zmq::signaler_t::signal (uint32_t signal_) { // TODO: Note that send is a blocking operation. // How should we behave if the signal cannot be written to the signaler? - int rc = send (w, &signal_, sizeof (signal_), 0); + int rc = send (w, (char*) &signal_, sizeof (signal_), 0); win_assert (rc != SOCKET_ERROR); zmq_assert (rc == sizeof (signal_)); } @@ -171,8 +171,6 @@ void zmq::signaler_t::xpoll () argp = 1; rc = ioctlsocket (r, FIONBIO, &argp); wsa_assert (rc != SOCKET_ERROR); - - return signals; } void zmq::signaler_t::xcheck () |