Merge pull request #3608 from hxw/master

[DragonFlyBSD] fix for IPv4 mapping not supported
zeromq · Aug 6, 2019 · c3eab89 · c3eab89
2 parents 6b60436 + 72854e6
commit c3eab89
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in
@@ -75,10 +75,15 @@
   #define ZMQ_HAVE_MINGW32
 #endif
 
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   #define ZMQ_HAVE_FREEBSD
 #endif
 
+#if defined(__DragonFly__)
+  #define ZMQ_HAVE_FREEBSD
+  #define ZMQ_HAVE_DRAGONFLY
+#endif
+
 #if defined __hpux
   #define ZMQ_HAVE_HPUX
 #endif

diff --git a/configure.ac b/configure.ac
@@ -233,6 +233,7 @@ case "${host_os}" in
         ;;
     *dragonfly*)
         CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
+        AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have DragonFly OS])
         AC_DEFINE(ZMQ_HAVE_DRAGONFLY, 1, [Have DragonFly OS])
         ;;
     *darwin*)

diff --git a/src/ip.cpp b/src/ip.cpp
@@ -129,7 +129,7 @@ void zmq::enable_ipv4_mapping (fd_t s_)
 {
     LIBZMQ_UNUSED (s_);
 
-#if defined IPV6_V6ONLY && !defined ZMQ_HAVE_OPENBSD
+#if defined IPV6_V6ONLY && !defined ZMQ_HAVE_OPENBSD && !defined ZMQ_HAVE_DRAGONFLY
 #ifdef ZMQ_HAVE_WINDOWS
     DWORD flag = 0;
 #else