From: Valentin Bartenev <vbart@nginx.com>
Date: Wed, 11 Feb 2015 17:00:07 +0000 (+0300)
Subject: Unbreak building on FreeBSD without file AIO.
X-Git-Tag: release-1.7.11~73
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=0a3d458805ff64c0778ad4c081ce9cc0dee4aa01;p=nginx.git

Unbreak building on FreeBSD without file AIO.

It appeared that the NGX_HAVE_AIO_SENDFILE macro was defined regardless of
the "--with-file-aio" configure option and the NGX_HAVE_FILE_AIO macro.

Now they are related.

Additionally, fixed one macro.
---

diff --git a/auto/os/freebsd b/auto/os/freebsd
index 6aa823f92..22ad40363 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -44,10 +44,12 @@ if [ $osreldate -gt 300007 ]; then
     CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS"
 fi
 
-if [ $osreldate -gt 502103 ]; then
-    echo " + sendfile()'s SF_NODISKIO found"
+if [ $NGX_FILE_AIO = YES ]; then
+    if [ $osreldate -gt 502103 ]; then
+        echo " + sendfile()'s SF_NODISKIO found"
 
-    have=NGX_HAVE_AIO_SENDFILE . auto/have
+        have=NGX_HAVE_AIO_SENDFILE . auto/have
+    fi
 fi
 
 # POSIX semaphores
diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h
index 219894ffc..9ee1c588c 100644
--- a/src/core/ngx_buf.h
+++ b/src/core/ngx_buf.h
@@ -94,7 +94,7 @@ struct ngx_output_chain_ctx_s {
     unsigned                     aio:1;
 
     ngx_output_chain_aio_pt      aio_handler;
-#if (NGX_HAVE_FILE_AIO)
+#if (NGX_HAVE_AIO_SENDFILE)
     ssize_t                    (*aio_preload)(ngx_buf_t *file);
 #endif
 #endif