add sun4v, style fix
diff --git a/auto/os/conf b/auto/os/conf index 5598f69..806beb9 100644 --- a/auto/os/conf +++ b/auto/os/conf
@@ -83,7 +83,7 @@ NGX_MACH_CACHE_LINE=64 ;; - sun4u | sparc | sparc64) + sun4u | sun4v | sparc | sparc64) have=NGX_ALIGNMENT value=16 . auto/define # TODO NGX_MACH_CACHE_LINE=64
diff --git a/src/core/nginx.c b/src/core/nginx.c index 31c90bd..22a4d29 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c
@@ -352,7 +352,8 @@ "using inherited sockets from \"%s\"", inherited); if (ngx_array_init(&cycle->listening, cycle->pool, 10, - sizeof(ngx_listening_t)) == NGX_ERROR) + sizeof(ngx_listening_t)) + == NGX_ERROR) { return NGX_ERROR; }