diff options
| author | Jeff Trawick <trawick@apache.org> | 2011-03-29 19:30:22 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2011-03-29 19:30:22 +0000 |
| commit | de28c58ce612b2991dbad1f518c6d91809ca0a4e (patch) | |
| tree | f2eae316527e67e48e064b19903ee6be6c10a312 /file_io/unix | |
| parent | b89f5bf348522bbc6f8928bad341178633647f4a (diff) | |
| download | apr-de28c58ce612b2991dbad1f518c6d91809ca0a4e.tar.gz | |
fix a bit of 'if FOO'/'ifdef FOO' confusion
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1086695 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/unix')
| -rw-r--r-- | file_io/unix/pipe.c | 8 | ||||
| -rw-r--r-- | file_io/unix/readwrite.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c index 7b8f01fb9..571d9bcb8 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) diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c index f12873877..98de9e0e1 100644 --- a/file_io/unix/readwrite.c +++ b/file_io/unix/readwrite.c @@ -23,7 +23,7 @@ /* The only case where we don't use wait_for_io_or_timeout is on * pre-BONE BeOS, so this check should be sufficient and simpler */ -#if !BEOS_R5 +#if !defined(BEOS_R5) #define USE_WAIT_FOR_IO #endif |