Merge pull request #1798 from gitplcc/feature/cygwin

Fix autotools build on Cygwin
zeromq · Nov 26, 2017 · 284a97e · 284a97e
2 parents cb550b3 + f36a6b2
commit 284a97e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/czmq_library.h b/include/czmq_library.h
@@ -52,7 +52,7 @@
 #   define CZMQ_PRIVATE
 #else
 #   define CZMQ_EXPORT
-#   if (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#   if (defined __GNUC__ && __GNUC__ >= 4 && !defined __CYGWIN__) || defined __INTEL_COMPILER
 #       define CZMQ_PRIVATE __attribute__ ((visibility ("hidden")))
 #   else
 #       define CZMQ_PRIVATE

diff --git a/include/czmq_prelude.h b/include/czmq_prelude.h
@@ -654,7 +654,9 @@ typedef int SOCKET;
 #   define closesocket      close
 #   define INVALID_SOCKET   -1
 #   define SOCKET_ERROR     -1
-#   define O_BINARY         0
+#   if !defined O_BINARY
+#       define O_BINARY      0
+#   endif
 #endif
 
 //- Include non-portable header files based on platform.h -------------------