From 723f71ddfe00d40b42b5582a55406e474401d3fd Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 30 Mar 2009 12:33:33 +0000 Subject: [PATCH] fix FreeBSD before 7 building, broken in r2616 --- auto/headers | 1 + auto/include | 1 + auto/os/features | 3 ++- src/os/unix/ngx_freebsd_config.h | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/auto/headers b/auto/headers index cdd5d294b..6f5225f81 100644 --- a/auto/headers +++ b/auto/headers @@ -6,6 +6,7 @@ ngx_include="unistd.h"; . auto/include ngx_include="inttypes.h"; . auto/include ngx_include="limits.h"; . auto/include ngx_include="sys/filio.h"; . auto/include +ngx_include="sys/param.h"; . auto/include ngx_include="sys/mount.h"; . auto/include ngx_include="sys/statvfs.h"; . auto/include ngx_include="crypt.h"; . auto/include diff --git a/auto/include b/auto/include index 4139238ca..3a047d303 100644 --- a/auto/include +++ b/auto/include @@ -16,6 +16,7 @@ ngx_found=no cat << END > $NGX_AUTOTEST.c +$NGX_INCLUDE_SYS_PARAM_H #include <$ngx_include> int main() { diff --git a/auto/os/features b/auto/os/features index f00663c88..3a9e1e98d 100644 --- a/auto/os/features +++ b/auto/os/features @@ -210,7 +210,8 @@ ngx_feature_test="directio(0, DIRECTIO_ON);" ngx_feature="statfs()" ngx_feature_name="NGX_HAVE_STATFS" ngx_feature_run=no -ngx_feature_incs="$NGX_INCLUDE_SYS_MOUNT_H +ngx_feature_incs="$NGX_INCLUDE_SYS_PARAM_H + $NGX_INCLUDE_SYS_MOUNT_H $NGX_INCLUDE_SYS_VFS_H" ngx_feature_path= ngx_feature_libs= diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h index 377148602..997581a6b 100644 --- a/src/os/unix/ngx_freebsd_config.h +++ b/src/os/unix/ngx_freebsd_config.h @@ -22,6 +22,7 @@ #include #include #include +#include /* ALIGN() */ #include /* statfs() */ #include /* FIONBIO */ @@ -44,7 +45,6 @@ #include /* setproctitle() before 4.1 */ #include #include -#include /* ALIGN() */ #if __FreeBSD_version < 400017