X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-Alien-ZMQ;a=blobdiff_plain;f=files%2Fzeromq-3.2.2-conditional-eproto.patch;fp=files%2Fzeromq-3.2.2-conditional-eproto.patch;h=31aad060758d4c58db07073c06c9b5cb5ee81ced;hp=0000000000000000000000000000000000000000;hb=db8094cee87e60a7167d3777e8fc96e51d7d6c8d;hpb=a2fd0c41556ec7a2b8311d98b16e31416fca63b4

diff --git a/files/zeromq-3.2.2-conditional-eproto.patch b/files/zeromq-3.2.2-conditional-eproto.patch
new file mode 100644
index 0000000..31aad06
--- /dev/null
+++ b/files/zeromq-3.2.2-conditional-eproto.patch
@@ -0,0 +1,38 @@
+diff -ur zeromq-3.2.2.orig/src/err.hpp zeromq-3.2.2/src/err.hpp
+--- zeromq-3.2.2.orig/src/err.hpp	2012-10-25 02:30:40.000000000 -0600
++++ zeromq-3.2.2/src/err.hpp	2013-01-21 10:56:25.095010874 -0700
+@@ -152,4 +152,10 @@
+ 
+ #endif
+ 
++// Conditionally check for EPROTO; some platforms (OpenBSD) don't support it.
++#ifdef EPROTO
++#define OR_ERRNO_EQ_EPROTO || errno == EPROTO
++#else
++#define OR_ERRNO_EQ_EPROTO
++#endif
+ 
+diff -ur zeromq-3.2.2.orig/src/ipc_listener.cpp zeromq-3.2.2/src/ipc_listener.cpp
+--- zeromq-3.2.2.orig/src/ipc_listener.cpp	2012-11-23 00:54:28.000000000 -0700
++++ zeromq-3.2.2/src/ipc_listener.cpp	2013-01-21 10:57:02.670355121 -0700
+@@ -196,7 +196,7 @@
+     fd_t sock = ::accept (s, NULL, NULL);
+     if (sock == -1) {
+         errno_assert (errno == EAGAIN || errno == EWOULDBLOCK ||
+-            errno == EINTR || errno == ECONNABORTED || errno == EPROTO ||
++            errno == EINTR || errno == ECONNABORTED OR_ERRNO_EQ_EPROTO ||
+             errno == ENFILE);
+         return retired_fd;
+     }
+diff -ur zeromq-3.2.2.orig/src/tcp_listener.cpp zeromq-3.2.2/src/tcp_listener.cpp
+--- zeromq-3.2.2.orig/src/tcp_listener.cpp	2012-11-23 00:54:28.000000000 -0700
++++ zeromq-3.2.2/src/tcp_listener.cpp	2013-01-21 10:56:48.884173113 -0700
+@@ -262,7 +262,7 @@
+ #else
+     if (sock == -1) {
+         errno_assert (errno == EAGAIN || errno == EWOULDBLOCK ||
+-            errno == EINTR || errno == ECONNABORTED || errno == EPROTO ||
++            errno == EINTR || errno == ECONNABORTED OR_ERRNO_EQ_EPROTO ||
+             errno == ENOBUFS || errno == ENOMEM || errno == EMFILE ||
+             errno == ENFILE);
+         return retired_fd;