diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 13:34:16 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 13:34:16 +0000 |
| commit | 0c9e5e185e775e6c7ffc7456261a9f8cd3c75075 (patch) | |
| tree | 327f703a2b75bea6661426e3892ed7dace57167b /src/os/unix/ngx_files.c | |
| parent | 6692bd213c3029fb45933e139d001f6a315c5197 (diff) | |
| download | nginx-0c9e5e185e775e6c7ffc7456261a9f8cd3c75075.tar.gz nginx-0c9e5e185e775e6c7ffc7456261a9f8cd3c75075.tar.bz2 | |
Merge of r4231, r4300, r4303, r4304:
Configure/build changes and fixes:
*) Revamped "configure --help" text.
*) FreeBSD 10-current has recently gotten POSIX_FADV_* macros.
A fix for the broken build applied.
*) AIX 7 defines sys_nerr in errno.h, therefore <errno.h> included
in the sys_nerr test.
When sys_nerr and _sys_nerr are missed on a particular platform
and our euristic for a maximum errno detection applied always
print the maximum errno number we reached instead of printing void.
This makes possible to build nginx on AIX 7.1.
*) Made it possible to build/install from the SVN checkout.
Diffstat (limited to '')
| -rw-r--r-- | src/os/unix/ngx_files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index ad26d2752..196323727 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -464,7 +464,7 @@ ngx_unlock_fd(ngx_fd_t fd) } -#if (NGX_HAVE_POSIX_FADVISE) +#if (NGX_HAVE_POSIX_FADVISE) && !(NGX_HAVE_F_READAHEAD) ngx_int_t ngx_read_ahead(ngx_fd_t fd, size_t n) |