Re: nginx-0.7.46

[Igor Sysoev <is@xxxxxxxxxxxxx>]

On Mon, Mar 30, 2009 at 04:18:15PM +0400, Sergey A. Osokin wrote:

> On Mon, Mar 30, 2009 at 03:06:00PM +0400, Igor Sysoev wrote:
> > Изменения в nginx 0.7.46                                          30.03.2009
> > 
> >     *) Исправление: архив предыдущего релиза был неверным.
> 
> Хм, не собирается на 6.4-STABLE.

Патч.


-- 
Igor Sysoev
http://sysoev.ru/en/

Index: src/os/unix/ngx_freebsd_config.h
===================================================================
--- src/os/unix/ngx_freebsd_config.h    (revision 1943)
+++ src/os/unix/ngx_freebsd_config.h    (working copy)
@@ -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
Index: auto/os/features
===================================================================
--- auto/os/features    (revision 1943)
+++ auto/os/features    (working copy)
@@ -210,7 +210,8 @@
 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=
Index: auto/include
===================================================================
--- auto/include        (revision 1943)
+++ auto/include        (working copy)
@@ -16,6 +16,7 @@
 
 cat << END > $NGX_AUTOTEST.c
 
+$NGX_INCLUDE_SYS_PARAM_H
 #include <$ngx_include>
 
 int main() {
Index: auto/headers
===================================================================
--- auto/headers        (revision 1943)
+++ auto/headers        (working copy)
@@ -6,6 +6,7 @@
 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