From 3a6c023989ba181288f44f533e324a0b9088d827 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 25 Jul 2016 16:23:35 +0300 Subject: [PATCH] Upstream: style, ngx_http_upstream_rr_peer_t.next moved. --- src/http/ngx_http_upstream_round_robin.h | 4 ++-- 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; };