commit 9d409b04f8a1f50b46f7d670622934dc6fcdc80a
author Ruslan Ermilov <ru@nginx.com> Thu Jul 16 14:20:48 2015 +0300
committer Ruslan Ermilov <ru@nginx.com> Thu Jul 16 14:20:48 2015 +0300
tree 47a24be3d70801c4495afd89ef27c04fbffa9a97
parent f21ea25c2b923956573cbadd6c665e4d49920477

Fixed strict aliasing warnings with old GCC versions.

src/http/modules/ngx_http_upstream_zone_module.c

diff --git a/src/http/modules/ngx_http_upstream_zone_module.c b/src/http/modules/ngx_http_upstream_zone_module.c
index 7169c36..7e5bd74 100644
--- a/src/http/modules/ngx_http_upstream_zone_module.c
+++ b/src/http/modules/ngx_http_upstream_zone_module.c
@@ -159,7 +159,7 @@
 
     /* copy peers to shared memory */
 
-    peersp = (ngx_http_upstream_rr_peers_t **) &shpool->data;
+    peersp = (ngx_http_upstream_rr_peers_t **) (void *) &shpool->data;
 
     for (i = 0; i < umcf->upstreams.nelts; i++) {
         uscf = uscfp[i];

src/stream/ngx_stream_upstream_zone_module.c

diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
index 87ddc03..ffc9e8a 100644
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -155,7 +155,7 @@
 
     /* copy peers to shared memory */
 
-    peersp = (ngx_stream_upstream_rr_peers_t **) &shpool->data;
+    peersp = (ngx_stream_upstream_rr_peers_t **) (void *) &shpool->data;
 
     for (i = 0; i < umcf->upstreams.nelts; i++) {
         uscf = uscfp[i];