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

HPUX build and gmake check issues solution (#1412)

Browse Source
This commit is contained in:
ALEKSANDR MELNIKOV 2015-06-02 20:17:15 +06:00
parent 4676e6551f
commit 1eb8e2a69f
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/socket_base.cpp
View File

@ -1489,9 +1489,23 @@ void zmq::socket_base_t::monitor_event (int event_, int value_, const std::strin
// Send event in first frame
zmq_msg_t msg;
zmq_msg_init_size (&msg, 6);
#ifdef ZMQ_HAVE_HPUX
// avoid SIGBUS
union {
uint8_t data[6];
struct {
uint16_t event;
uint32_t value;
} v;
} u;
u.v.event = event_;
u.v.value = value_;
memcpy(zmq_msg_data (&msg), u.data, 6);
#else
uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
*(uint16_t *) (data + 0) = (uint16_t) event_;
*(uint32_t *) (data + 2) = (uint32_t) value_;
#endif
zmq_sendmsg (monitor_socket, &msg, ZMQ_SNDMORE);
// Send address in second frame

2
src/thread.cpp
View File

@ -104,7 +104,7 @@ void zmq::thread_t::stop ()
void zmq::thread_t::setSchedulingParameters(int priority_, int schedulingPolicy_)
{
#if !defined ZMQ_HAVE_ZOS
#if !defined ZMQ_HAVE_ZOS && !defined ZMQ_HAVE_HPUX
int policy = 0;
struct sched_param param;

4
tests/test_srcfd.cpp
View File

@ -67,7 +67,11 @@ int main (void)
// get the remote endpoint
struct sockaddr_storage ss;
#ifdef ZMQ_HAVE_HPUX
int addrlen = sizeof ss;
#else
socklen_t addrlen = sizeof ss;
#endif
rc = getpeername (srcFd, (struct sockaddr*) &ss, &addrlen);
assert (rc == 0);