diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-07-25 16:23:35 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-07-25 16:23:35 +0300 |
| commit | 778c00c415e08fe25858f9f62fc2c914234c2005 (patch) | |
| tree | ffa87ddcfaa6d293bf4fdd0e6c2a2b105917220a | |
| parent | c8526aca2529ee0095afc3016a2f4106a9aeefdf (diff) | |
| download | nginx-778c00c415e08fe25858f9f62fc2c914234c2005.tar.gz nginx-778c00c415e08fe25858f9f62fc2c914234c2005.tar.bz2 | |
Upstream: style, ngx_http_upstream_rr_peer_t.next moved.
| -rw-r--r-- | src/http/ngx_http_upstream_round_robin.h | 4 | ||||
| -rw-r--r-- | src/stream/ngx_stream_upstream_round_robin.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h index f2c573f3f..355620add 100644 --- a/src/http/ngx_http_upstream_round_robin.h +++ b/src/http/ngx_http_upstream_round_robin.h @@ -42,11 +42,11 @@ struct ngx_http_upstream_rr_peer_s { int ssl_session_len; #endif - ngx_http_upstream_rr_peer_t *next; - #if (NGX_HTTP_UPSTREAM_ZONE) ngx_atomic_t lock; #endif + + ngx_http_upstream_rr_peer_t *next; }; diff --git a/src/stream/ngx_stream_upstream_round_robin.h b/src/stream/ngx_stream_upstream_round_robin.h index 452c2e927..bdec0b826 100644 --- a/src/stream/ngx_stream_upstream_round_robin.h +++ b/src/stream/ngx_stream_upstream_round_robin.h @@ -42,11 +42,11 @@ struct ngx_stream_upstream_rr_peer_s { int ssl_session_len; #endif - ngx_stream_upstream_rr_peer_t *next; - #if (NGX_STREAM_UPSTREAM_ZONE) ngx_atomic_t lock; #endif + + ngx_stream_upstream_rr_peer_t *next; }; |