From beb4da3c28cff501a33de34cec95ca110cd3084e Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 29 Apr 2010 20:53:46 +0200 Subject: [PATCH] windows port fixed --- builds/msvc/libzmq/libzmq.vcproj | 34 +++++--------------------------- 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 ef44f200..219d7579 100644 --- a/builds/msvc/libzmq/libzmq.vcproj +++ b/builds/msvc/libzmq/libzmq.vcproj @@ -197,10 +197,6 @@ RelativePath="..\..\..\src\err.cpp" > - - @@ -293,6 +289,10 @@ RelativePath="..\..\..\src\session.cpp" > + + @@ -337,10 +337,6 @@ RelativePath="..\..\..\src\xreq.cpp" > - - @@ -379,10 +375,6 @@ RelativePath="..\..\..\src\app_thread.hpp" > - - @@ -431,10 +423,6 @@ RelativePath="..\..\..\src\fd.hpp" > - - @@ -459,14 +447,6 @@ RelativePath="..\..\..\src\i_poll_events.hpp" > - - - - @@ -564,7 +544,7 @@ > - - diff --git a/src/signaler.cpp b/src/signaler.cpp index 2d89ecac..e1fa6a3b 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 ()