# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1160139743 0
# Node ID 95aa79944291e0839c38f9c37a1186805204ab01
# Parent  34bb8726f4541db2042f54bd7b88b0dfa8df3b63
add sun4v,
style fix

diff --git a/auto/os/conf b/auto/os/conf
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -83,7 +83,7 @@ case "$NGX_MACHINE" in
         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
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -352,7 +352,8 @@ ngx_add_inherited_sockets(ngx_cycle_t *c
                   "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;
     }