From 0c9e5e185e775e6c7ffc7456261a9f8cd3c75075 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 14 Dec 2011 13:34:16 +0000 Subject: 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 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. --- src/os/unix/ngx_files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/os/unix/ngx_files.c') 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) -- cgit