Mercurial > hg > nginx
changeset 2624:418c9f97bd01
fix FreeBSD before 7 building, broken in r2616
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 30 Mar 2009 12:33:33 +0000 |
parents | 7bc0851b05cf |
children | 754ab3d3fe18 |
files | auto/headers auto/include auto/os/features src/os/unix/ngx_freebsd_config.h |
diffstat | 4 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/headers +++ b/auto/headers @@ -6,6 +6,7 @@ ngx_include="unistd.h"; . auto/incl 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
--- 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() {
--- a/auto/os/features +++ b/auto/os/features @@ -210,7 +210,8 @@ ngx_feature_test="directio(0, DIRECTIO_O 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=
--- a/src/os/unix/ngx_freebsd_config.h +++ b/src/os/unix/ngx_freebsd_config.h @@ -22,6 +22,7 @@ #include <grp.h> #include <dirent.h> #include <glob.h> +#include <sys/param.h> /* ALIGN() */ #include <sys/mount.h> /* statfs() */ #include <sys/filio.h> /* FIONBIO */ @@ -44,7 +45,6 @@ #include <libutil.h> /* setproctitle() before 4.1 */ #include <osreldate.h> #include <sys/sysctl.h> -#include <sys/param.h> /* ALIGN() */ #if __FreeBSD_version < 400017