Fix Hurd build, another go

[users/heiko/exim.git] / src / OS / os.c-GNU

diff --git a/src/OS/os.c-GNU b/src/OS/os.c-GNU
index 06226839b68b051b6e20d432a6a92b0428ceec92..a75166322f09f5ceb84528dbaab0a384db5387ad 100644 (file)
--- a/src/OS/os.c-GNU
+++ b/src/OS/os.c-GNU
@@ -56,9 +56,10 @@ return -1;
 ssize_t
 os_pipe_read(int fd, void * buf, size_t count)
 {
 ssize_t
 os_pipe_read(int fd, void * buf, size_t count)
 {

-for (int rc, retries = 10; retries > 0; retries--)
+int rc;
+for (int retries = 10; retries > 0; retries--)

   {
   {

-  if ((rc = read(fd, buf, count) >= 0) break;
+  if ((rc = read(fd, buf, count)) >= 0) break;

   if (rc != -1 || errno != EINTR) break;
   }
 return rc;
   if (rc != -1 || errno != EINTR) break;
   }
 return rc;


@@ -68,20 +69,22 @@ return rc;
 ssize_t
 os_pipe_write(int fd, void * buf, size_t count)
 {
 ssize_t
 os_pipe_write(int fd, void * buf, size_t count)
 {

-for (int rc, retries = 10; retries > 0; retries--)
+int rc;
+for (int retries = 10; retries > 0; retries--)

   {
   {

-  if ((rc = write(fd, buf, count) >= 0) break;
+  if ((rc = write(fd, buf, count)) >= 0) break;

   if (rc != -1 || errno != EINTR) break;
   }
 return rc;
 }
 
 ssize_t
   if (rc != -1 || errno != EINTR) break;
   }
 return rc;
 }
 
 ssize_t

-os_pipe_writev(int fd, const struct iovec * iov, int iovcnt
+os_pipe_writev(int fd, const struct iovec * iov, int iovcnt)

 {
 {

-for (int rc, retries = 10; retries > 0; retries--)
+int rc;
+for (int retries = 10; retries > 0; retries--)

   {
   {

-  if ((rc = writev(fd, iov, iovcnt) >= 0) break;
+  if ((rc = writev(fd, iov, iovcnt)) >= 0) break;

   if (rc != -1 || errno != EINTR) break;
   }
 return rc;
   if (rc != -1 || errno != EINTR) break;
   }
 return rc;