diff options
| author | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
| commit | 073d039ce1755179ade6d76571f16045ade34213 (patch) | |
| tree | 0e023fb89b7a7e9a4fa11cfb7d9118a7510d2640 /contrib/apr/file_io/unix/pipe.c | |
| parent | c5be37fb1f34d0c40f8f70140824b785f414c4da (diff) | |
| parent | ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0 (diff) | |
| download | FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.zip FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.tar.gz | |
Merge apr-1.4.8 -> apr-1.5.1 and update.
Diffstat (limited to 'contrib/apr/file_io/unix/pipe.c')
| -rw-r--r-- | contrib/apr/file_io/unix/pipe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/apr/file_io/unix/pipe.c b/contrib/apr/file_io/unix/pipe.c index 7b8f01f..571d9bc 100644 --- a/contrib/apr/file_io/unix/pipe.c +++ b/contrib/apr/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) |
