diff options
| author | Bernd Melchers <melchers@ZEDAT.FU-Berlin.DE> | 2010-09-02 07:33:57 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-09-02 07:33:57 +0200 |
| commit | 8ec0743c7551de3c76126d080961cece732370f1 (patch) | |
| tree | 3d92e36347c3504d1c4afae6304d4ba4ba72c7f6 | |
| parent | d5b6f680a54c682da066e769c46075a4bc57bd55 (diff) | |
Fix for signaler_t on HP-UX and AIX platforms
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/signaler.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -5,6 +5,7 @@ Alexej Lotz <alexej.lotz@arcor.de> Asko Kauppi <askok@dnainternet.net> Barak Amar <barak.amar@gmail.com> Bernd Prager <bernd@prager.ws> +Bernd Melchers <melchers@ZEDAT.FU-Berlin.DE> Brian Buchanan <bwb@holo.org> Chris Wong <chris@chriswongstudio.com> Conrad D. Steenberg <conrad.steenberg@caltech.edu> diff --git a/src/signaler.cpp b/src/signaler.cpp index d65957e..d4a9214 100644 --- a/src/signaler.cpp +++ b/src/signaler.cpp @@ -184,7 +184,7 @@ void zmq::signaler_t::send (const command_t &cmd_) zmq_assert (nbytes == sizeof (command_t)); } -bool zmq::signaler_t::recv (command_t &cmd_, bool block_) +bool zmq::signaler_t::recv (command_t *cmd_, bool block_) { if (block_) { @@ -199,7 +199,7 @@ bool zmq::signaler_t::recv (command_t &cmd_, bool block_) bool result; ssize_t nbytes; do { - nbytes = ::recv (r, buffer, sizeof (command_t), 0); + nbytes = ::recv (r, (char*) cmd_, sizeof (command_t), 0); } while (nbytes == -1 && errno == EINTR); if (nbytes == -1 && errno == EAGAIN) { result = false; @@ -213,7 +213,7 @@ bool zmq::signaler_t::recv (command_t &cmd_, bool block_) result = true; } - if (block_) + if (block_) { // Set the reader to non-blocking mode. int flags = fcntl (r, F_GETFL, 0); |