1 files changed, 10 insertions, 10 deletions

diff --git a/atomicio.c b/atomicio.c
index f32ff85ba..a6b2d127a 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -34,6 +34,10 @@
 #include <errno.h>
 #ifdef HAVE_POLL_H
 #include <poll.h>
+#else
+# ifdef HAVE_SYS_POLL_H
+#  include <sys/poll.h>
+# endif
 #endif
 #include <string.h>
 #include <unistd.h>
@@ -57,13 +61,9 @@ atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
                 res = (f) (fd, s + pos, n - pos);
                 switch (res) {
                 case -1:
-#ifdef EWOULDBLOCK
-                        if (errno == EINTR || errno == EWOULDBLOCK)
-#else
                         if (errno == EINTR)
-#endif
                                 continue;
-                        if (errno == EAGAIN) {
+                        if (errno == EAGAIN || errno == EWOULDBLOCK) {
                                 (void)poll(&pfd, 1, -1);
                                 continue;
                         }
@@ -97,20 +97,20 @@ atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
         /* Make a copy of the iov array because we may modify it below */
         memcpy(iov, _iov, iovcnt * sizeof(*_iov));
 
+#ifndef BROKEN_READV_COMPARISON
         pfd.fd = fd;
         pfd.events = f == readv ? POLLIN : POLLOUT;
+#endif
         for (; iovcnt > 0 && iov[0].iov_len > 0;) {
                 res = (f) (fd, iov, iovcnt);
                 switch (res) {
                 case -1:
-#ifdef EWOULDBLOCK
-                        if (errno == EINTR || errno == EWOULDBLOCK)
-#else
                         if (errno == EINTR)
-#endif
                                 continue;
-                        if (errno == EAGAIN) {
+                        if (errno == EAGAIN || errno == EWOULDBLOCK) {
+#ifndef BROKEN_READV_COMPARISON
                                 (void)poll(&pfd, 1, -1);
+#endif
                                 continue;
                         }
                         return 0;