Merge branch 'master' of github.com:zeromq/libzmq

include/zmq.h

@@ -59,8 +59,8 @@ extern "C" {
 
 /*  Version macros for compile-time API version detection                     */
 #define ZMQ_VERSION_MAJOR 3
-#define ZMQ_VERSION_MINOR 1
-#define ZMQ_VERSION_PATCH 1
+#define ZMQ_VERSION_MINOR 3
+#define ZMQ_VERSION_PATCH 0
 
 #define ZMQ_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

src/ipc_listener.cpp

@@ -103,7 +103,11 @@ void zmq::ipc_listener_t::in_event ()
 int zmq::ipc_listener_t::get_address (std::string &addr_)
 {
     struct sockaddr_storage ss;
+#ifdef ZMQ_HAVE_HPUX
+    int sl = sizeof (ss);
+#else
     socklen_t sl = sizeof (ss);
+#endif
     int rc = getsockname (s, (sockaddr *) &ss, &sl);
     if (rc != 0) {
         addr_.clear ();

src/stream_engine.cpp

@@ -78,7 +78,7 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_) :
 #endif
     }
 
-#if defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_FREEBSD
+#ifdef SO_NOSIGPIPE
     //  Make sure that SIGPIPE signal is not generated when writing to a
     //  connection that was already closed by the peer.
     int set = 1;

src/tcp_listener.cpp

@@ -133,7 +133,11 @@ int zmq::tcp_listener_t::get_address (std::string &addr_)
 {
     // Get the details of the TCP socket
     struct sockaddr_storage ss;
+#ifdef ZMQ_HAVE_HPUX
+    int sl = sizeof (ss);
+#else
     socklen_t sl = sizeof (ss);
+#endif
     int rc = getsockname (s, (struct sockaddr *) &ss, &sl);
 
     if (rc != 0) {
@@ -233,7 +237,11 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
     zmq_assert (s != retired_fd);
 
     struct sockaddr_storage ss = {0};
+#ifdef ZMQ_HAVE_HPUX
+    int ss_len = sizeof (ss);
+#else
     socklen_t ss_len = sizeof (ss);
+#endif
     fd_t sock = ::accept (s, (struct sockaddr *) &ss, &ss_len);
 
 #ifdef ZMQ_HAVE_WINDOWS