zmq.cpp build probelm on non-linux platforms fixed

2 files changed, 8 insertions, 7 deletions

diff --git a/man/man3/zmq_setsockopt.3 b/man/man3/zmq_setsockopt.3
index ffbd345..f419f78 100644
--- a/man/man3/zmq_setsockopt.3
+++ b/man/man3/zmq_setsockopt.3
@@ -60,12 +60,10 @@ Type: string  Unit: N/A  Default: NULL
 .IP "\fBZMQ_SUBSCRIBE\fP"
 Applicable only to ZMQ_SUB socket type. It establishes new message filter.
 When ZMQ_SUB socket is created all the incoming messages are filtered out.
-This option allows you to subscribe for all messages ("*"), messages with
-specific topic ("x.y.z") and/or messages with specific topic prefix
-("x.y.*"). Topic is one-byte-size-prefixed string located at
-the very beginning of the message. Multiple filters can be attached to
-a single 'sub' socket. In that case message passes if it matches at least
-one of the filters.
+This option allows you to subscribe for all messages (""), or messages 
+beginning with specific prefix (e.g. "animals.mammals.dogs."). Multiple
+filters can be attached to a single 'sub' socket. In that case message passes
+if it matches at least one of the filters.
 
 Type: string  Unit: N/A  Default: N/A
 
diff --git a/src/zmq.cpp b/src/zmq.cpp
index e244171..62ee562 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -33,7 +33,10 @@
 #include "err.hpp"
 #include "fd.hpp"
 
-#if defined ZMQ_HAVE_LINUX
+#if defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_FREEBSD ||\
+    defined ZMQ_HAVE_OPENBSD || defined ZMQ_HAVE_SOLARIS ||\
+    defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_QNXNTO ||\
+    defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_AIX
 #include <poll.h>
 #endif