diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-03-30 12:33:33 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-03-30 12:33:33 +0000 |
| commit | 723f71ddfe00d40b42b5582a55406e474401d3fd (patch) | |
| tree | 8e1b23945847184ce764ced178907b58651b885d | |
| parent | 0370ff015eeebf149756123d2d4d615ffe8c092d (diff) | |
| download | nginx-723f71ddfe00d40b42b5582a55406e474401d3fd.tar.gz nginx-723f71ddfe00d40b42b5582a55406e474401d3fd.zip | |
fix FreeBSD before 7 building, broken in r2616
| -rw-r--r-- | auto/headers | 1 | ||||
| -rw-r--r-- | auto/include | 1 | ||||
| -rw-r--r-- | auto/os/features | 3 | ||||
| -rw-r--r-- | 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 <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 |