diff options
| -rw-r--r-- | auto/os/conf | 2 | ||||
| -rw-r--r-- | 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; } |