From 852cde4ccd03b755f776ba3e31ea2cd038aad666 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 6 Oct 2006 13:02:23 +0000
Subject: [PATCH] add sun4v, style fix

---
 auto/os/conf     | 2 +-
 src/core/nginx.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/auto/os/conf b/auto/os/conf
index 5598f69a7..806beb9e9 100644
--- 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 31c90bd6f..22a4d290b 100644
--- 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;
     }