From 8ec0743c7551de3c76126d080961cece732370f1 Mon Sep 17 00:00:00 2001 From: Bernd Melchers Date: Thu, 2 Sep 2010 07:33:57 +0200 Subject: Fix for signaler_t on HP-UX and AIX platforms --- AUTHORS | 1 + src/signaler.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 304be0f..0256523 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ Alexej Lotz Asko Kauppi Barak Amar Bernd Prager +Bernd Melchers Brian Buchanan Chris Wong Conrad D. Steenberg 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); -- cgit v1.2.3