[nginx] svn commit: r4300 - trunk/src/os/unix

[maxim at nginx.com]

Author: maxim
Date: 2011-11-18 18:42:00 +0000 (Fri, 18 Nov 2011)
New Revision: 4300

Log:
FreeBSD 10-current has recently gotten POSIX_FADV_* macros.
A fix for the broken build applied.

Patch from Igor Sysoev.


Modified:
   trunk/src/os/unix/ngx_files.c

Modified: trunk/src/os/unix/ngx_files.c
===================================================================
--- trunk/src/os/unix/ngx_files.c	2011-11-18 15:09:08 UTC (rev 4299)
+++ trunk/src/os/unix/ngx_files.c	2011-11-18 18:42:00 UTC (rev 4300)
@@ -464,7 +464,7 @@
 }
 
 
-#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)