diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-10-06 13:02:23 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-10-06 13:02:23 +0000 |
| commit | 852cde4ccd03b755f776ba3e31ea2cd038aad666 (patch) | |
| tree | fb4ca208c1614368e490b442caf21f222b0506ec | |
| parent | 6c5c4d0eec6487f72976095e7518b47d5ea324b4 (diff) | |
| download | nginx-852cde4ccd03b755f776ba3e31ea2cd038aad666.tar.gz nginx-852cde4ccd03b755f776ba3e31ea2cd038aad666.tar.bz2 | |
add sun4v,
style fix
| -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; } |