]> git.kaiwu.me - nginx.git/commitdiff
o AIX 7 defines sys_nerr in errno.h, therefore <errno.h> included
authorMaxim Konovalov <maxim@nginx.com>
Mon, 21 Nov 2011 11:51:41 +0000 (11:51 +0000)
committerMaxim Konovalov <maxim@nginx.com>
Mon, 21 Nov 2011 11:51:41 +0000 (11:51 +0000)
in the sys_nerr test.

o When sys_nerr and _sys_nerr are missed on a particular platform
and our euristic for a maximum errno detection applied always
print the maximum errno number we reached instead of printing void.[*]

* patch from Maxim Dounin

This commit makes possible to build nginx on AIX 7.1.

auto/unix

index ca533487cc9511c4edd627821402e4058dbac2b9..7621e8fa23266e7d4f7f0e5ba87d60804a779ca2 100755 (executable)
--- a/auto/unix
+++ b/auto/unix
@@ -496,7 +496,8 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0)"
 ngx_feature="sys_nerr"
 ngx_feature_name="NGX_SYS_NERR"
 ngx_feature_run=value
-ngx_feature_incs='#include <stdio.h>'
+ngx_feature_incs='#include <errno.h>
+                  #include <stdio.h>'
 ngx_feature_path=
 ngx_feature_libs=
 ngx_feature_test='printf("%d", sys_nerr);'
@@ -538,10 +539,10 @@ if [ $ngx_found = no ]; then
                               || p == NULL
                               || strncmp(p, "Unknown error", 13) == 0)
                           {
-                              printf("%d", n);
-                              return 0;
+                              break;
                           }
-                     }'
+                      }
+                      printf("%d", n);'
     . auto/feature
 fi