generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-15 15:16:52 +02:00
Code Issues Projects Releases Wiki Activity

ZMQII-69: Make 0MQ build on HP-UX

Browse Source
This commit is contained in:
Martin Sustrik
2010-02-10 11:04:28 +01:00
parent 8c25bab31d
commit 2d44bf3644
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fd_signaler.cpp
View File

@@ -249,10 +249,10 @@ void zmq::fd_signaler_t::signal (int signal_)
uint64_t zmq::fd_signaler_t::poll () uint64_t zmq::fd_signaler_t::poll ()
{ {
// Set the reader to blocking mode. // Set the reader to blocking mode.
int flags = fcntl (fd, F_GETFL, 0); int flags = fcntl (r, F_GETFL, 0);
if (flags == -1) if (flags == -1)
flags = 0; flags = 0;
int rc = fcntl (fd, F_SETFL, flags & ~O_NONBLOCK); int rc = fcntl (r, F_SETFL, flags & ~O_NONBLOCK);
errno_assert (rc != -1); errno_assert (rc != -1);
// Poll for events. // Poll for events.

6
src/tcp_connecter.cpp
View File

@@ -268,7 +268,11 @@ zmq::fd_t zmq::tcp_connecter_t::connect ()
// Following code should handle both Berkeley-derived socket // Following code should handle both Berkeley-derived socket
// implementations and Solaris. // implementations and Solaris.
int err = 0; int err = 0;
socklen_t len = sizeof err; #if defined ZMQ_HAVE_HPUX
int len = sizeof (err);
#else
socklen_t len = sizeof (err);
#endif
int rc = getsockopt (s, SOL_SOCKET, SO_ERROR, (char*) &err, &len); int rc = getsockopt (s, SOL_SOCKET, SO_ERROR, (char*) &err, &len);
if (rc == -1) if (rc == -1)
err = errno; err = errno;