comparison src/os/unix/ngx_files.c @ 4354:cdb2e95bd3d0 stable-1.0

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 14 Dec 2011 13:34:16 +0000
parents d1d34de1a419
children 4919fb357a5d
comparison
equal deleted inserted replaced
4353:710e35d17c28 4354:cdb2e95bd3d0
462 462
463 return 0; 463 return 0;
464 } 464 }
465 465
466 466
467 #if (NGX_HAVE_POSIX_FADVISE) 467 #if (NGX_HAVE_POSIX_FADVISE) && !(NGX_HAVE_F_READAHEAD)
468 468
469 ngx_int_t 469 ngx_int_t
470 ngx_read_ahead(ngx_fd_t fd, size_t n) 470 ngx_read_ahead(ngx_fd_t fd, size_t n)
471 { 471 {
472 int err; 472 int err;