Dogcows Code - chaz/p5-Alien-ZMQ/blob - files/zeromq-3.2.2-conditional-eproto.patch

   1 diff -ur zeromq-3.2.2.orig/src/err.hpp zeromq-3.2.2/src/err.hpp
   2 --- zeromq-3.2.2.orig/src/err.hpp       2012-10-25 02:30:40.000000000 -0600
   3 +++ zeromq-3.2.2/src/err.hpp    2013-01-21 10:56:25.095010874 -0700
   4 @@ -152,4 +152,10 @@
   5
   6  #endif
   7
   8 +// Conditionally check for EPROTO; some platforms (OpenBSD) don't support it.
   9 +#ifdef EPROTO
  10 +#define OR_ERRNO_EQ_EPROTO || errno == EPROTO
  11 +#else
  12 +#define OR_ERRNO_EQ_EPROTO
  13 +#endif
  14
  15 diff -ur zeromq-3.2.2.orig/src/ipc_listener.cpp zeromq-3.2.2/src/ipc_listener.cpp
  16 --- zeromq-3.2.2.orig/src/ipc_listener.cpp      2012-11-23 00:54:28.000000000 -0700
  17 +++ zeromq-3.2.2/src/ipc_listener.cpp   2013-01-21 10:57:02.670355121 -0700
  18 @@ -196,7 +196,7 @@
  19      fd_t sock = ::accept (s, NULL, NULL);
  20      if (sock == -1) {
  21          errno_assert (errno == EAGAIN || errno == EWOULDBLOCK ||
  22 -            errno == EINTR || errno == ECONNABORTED || errno == EPROTO ||
  23 +            errno == EINTR || errno == ECONNABORTED OR_ERRNO_EQ_EPROTO ||
  24              errno == ENFILE);
  25          return retired_fd;
  26      }
  27 diff -ur zeromq-3.2.2.orig/src/tcp_listener.cpp zeromq-3.2.2/src/tcp_listener.cpp
  28 --- zeromq-3.2.2.orig/src/tcp_listener.cpp      2012-11-23 00:54:28.000000000 -0700
  29 +++ zeromq-3.2.2/src/tcp_listener.cpp   2013-01-21 10:56:48.884173113 -0700
  30 @@ -262,7 +262,7 @@
  31  #else
  32      if (sock == -1) {
  33          errno_assert (errno == EAGAIN || errno == EWOULDBLOCK ||
  34 -            errno == EINTR || errno == ECONNABORTED || errno == EPROTO ||
  35 +            errno == EINTR || errno == ECONNABORTED OR_ERRNO_EQ_EPROTO ||
  36              errno == ENOBUFS || errno == ENOMEM || errno == EMFILE ||
  37              errno == ENFILE);
  38          return retired_fd;