From: Maxim Dounin Date: Mon, 25 Jul 2016 13:23:35 +0000 (+0300) Subject: Upstream: style, ngx_http_upstream_rr_peer_t.next moved. X-Git-Tag: release-1.11.5~38 X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=778c00c415e08fe25858f9f62fc2c914234c2005;p=nginx.git Upstream: style, ngx_http_upstream_rr_peer_t.next moved. --- 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; };