details: http://hg.nginx.org/nginx/rev/0f234ee664f7
branches:
changeset: 5981:0f234ee664f7
user: Valentin Bartenev <vbart@nginx.com>
date: Wed Feb 11 20:00:07 2015 +0300
description:
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.

diffstat:

auto/os/freebsd | 8 +++++---
src/core/ngx_buf.h | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r ccad84a174e0 -r 0f234ee664f7 auto/os/freebsd
--- a/auto/os/freebsd Wed Feb 11 17:52:15 2015 +0300
+++ b/auto/os/freebsd Wed Feb 11 20:00:07 2015 +0300
@@ -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 -r ccad84a174e0 -r 0f234ee664f7 src/core/ngx_buf.h
--- a/src/core/ngx_buf.h Wed Feb 11 17:52:15 2015 +0300
+++ b/src/core/ngx_buf.h Wed Feb 11 20:00:07 2015 +0300
@@ -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

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel