Mercurial > hg > nginx
comparison src/event/ngx_event_accept.c @ 2962:19f9a5eae383 stable-0.7
merge r2952:
ignore ngx_atomic_fetch_add() result
this fixes building at least by gcc 4.2.1 on Mac OS X 10.6
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 22 Jun 2009 09:31:33 +0000 |
parents | 53be1d485af9 |
children | a7491af45540 |
comparison
equal
deleted
inserted
replaced
2961:31526449835f | 2962:19f9a5eae383 |
---|---|
73 | 73 |
74 return; | 74 return; |
75 } | 75 } |
76 | 76 |
77 #if (NGX_STAT_STUB) | 77 #if (NGX_STAT_STUB) |
78 ngx_atomic_fetch_add(ngx_stat_accepted, 1); | 78 (void) ngx_atomic_fetch_add(ngx_stat_accepted, 1); |
79 #endif | 79 #endif |
80 | 80 |
81 ngx_accept_disabled = ngx_cycle->connection_n / 8 | 81 ngx_accept_disabled = ngx_cycle->connection_n / 8 |
82 - ngx_cycle->free_connection_n; | 82 - ngx_cycle->free_connection_n; |
83 | 83 |
91 | 91 |
92 return; | 92 return; |
93 } | 93 } |
94 | 94 |
95 #if (NGX_STAT_STUB) | 95 #if (NGX_STAT_STUB) |
96 ngx_atomic_fetch_add(ngx_stat_active, 1); | 96 (void) ngx_atomic_fetch_add(ngx_stat_active, 1); |
97 #endif | 97 #endif |
98 | 98 |
99 c->pool = ngx_create_pool(ls->pool_size, ev->log); | 99 c->pool = ngx_create_pool(ls->pool_size, ev->log); |
100 if (c->pool == NULL) { | 100 if (c->pool == NULL) { |
101 ngx_close_accepted_connection(c); | 101 ngx_close_accepted_connection(c); |
186 */ | 186 */ |
187 | 187 |
188 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1); | 188 c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1); |
189 | 189 |
190 #if (NGX_STAT_STUB) | 190 #if (NGX_STAT_STUB) |
191 ngx_atomic_fetch_add(ngx_stat_handled, 1); | 191 (void) ngx_atomic_fetch_add(ngx_stat_handled, 1); |
192 #endif | 192 #endif |
193 | 193 |
194 #if (NGX_THREADS) | 194 #if (NGX_THREADS) |
195 rev->lock = &c->lock; | 195 rev->lock = &c->lock; |
196 wev->lock = &c->lock; | 196 wev->lock = &c->lock; |
377 if (c->pool) { | 377 if (c->pool) { |
378 ngx_destroy_pool(c->pool); | 378 ngx_destroy_pool(c->pool); |
379 } | 379 } |
380 | 380 |
381 #if (NGX_STAT_STUB) | 381 #if (NGX_STAT_STUB) |
382 ngx_atomic_fetch_add(ngx_stat_active, -1); | 382 (void) ngx_atomic_fetch_add(ngx_stat_active, -1); |
383 #endif | 383 #endif |
384 } | 384 } |
385 | 385 |
386 | 386 |
387 u_char * | 387 u_char * |