From bc9ddba9ef9abe23eadcdb51b2ce814c00c00639 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 27 May 2014 07:00:33 +0000
Subject: Vendor import apr-1.5.1

---
 file_io/unix/pipe.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'file_io/unix/pipe.c')

diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c
index 7b8f01fb92aa..571d9bcb8e99 100644
--- a/file_io/unix/pipe.c
+++ b/file_io/unix/pipe.c
@@ -25,8 +25,8 @@
  * but now fcntl does, hence we need to do this extra checking.
  * The joys of beta programs. :-)
  */
-#if BEOS
-#if !BONE7
+#if defined(BEOS)
+#if !defined(BONE7)
 # define BEOS_BLOCKING 1
 #else
 # define BEOS_BLOCKING 0
@@ -35,7 +35,7 @@
 
 static apr_status_t pipeblock(apr_file_t *thepipe)
 {
-#if !BEOS_BLOCKING
+#if !defined(BEOS) || !BEOS_BLOCKING
       int fd_flags;
 
       fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
@@ -71,7 +71,7 @@ static apr_status_t pipeblock(apr_file_t *thepipe)
 
 static apr_status_t pipenonblock(apr_file_t *thepipe)
 {
-#if !BEOS_BLOCKING
+#if !defined(BEOS) || !BEOS_BLOCKING
       int fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
 
 #  if defined(O_NONBLOCK)
-- 
cgit v1.2.3