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/support/unix/waitio.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/support/unix/waitio.c')
| -rw-r--r-- | contrib/apr/support/unix/waitio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/apr/support/unix/waitio.c b/contrib/apr/support/unix/waitio.c index 7232cdd..0d762ea 100644 --- a/contrib/apr/support/unix/waitio.c +++ b/contrib/apr/support/unix/waitio.c @@ -22,7 +22,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) && !defined(OS2) && APR_FILES_AS_SOCKETS #define USE_WAIT_FOR_IO #endif |
