add sun4v,

style fix

diff --git a/auto/os/conf b/auto/os/conf
index 5598f69a785c598222efdd0686d13142b6e35343..806beb9e9c43c51cf64dd447ee58830cac56d36b 100644 (file)
--- 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
index 31c90bd6f3514998e4e98281fcc93cd8af741077..22a4d290b61b369fb64324c00ddd3592cff1bb0b 100644 (file)
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -352,7 +352,8 @@ ngx_add_inherited_sockets(ngx_cycle_t *cycle)
                   "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;
     }