From: Ruslan Ermilov <ru@nginx.com>
Date: Thu, 16 Jul 2015 11:20:48 +0000 (+0300)
Subject: Fixed strict aliasing warnings with old GCC versions.
X-Git-Tag: release-1.9.4~20
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=6dc03bf1a44169918841797080f903324c6d2165;p=nginx.git

Fixed strict aliasing warnings with old GCC versions.
---

diff --git a/src/http/modules/ngx_http_upstream_zone_module.c b/src/http/modules/ngx_http_upstream_zone_module.c
index 7169c365e..7e5bd7476 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 @@ ngx_http_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 
     /* 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];
diff --git a/src/stream/ngx_stream_upstream_zone_module.c b/src/stream/ngx_stream_upstream_zone_module.c
index 87ddc03d5..ffc9e8a69 100644
--- a/src/stream/ngx_stream_upstream_zone_module.c
+++ b/src/stream/ngx_stream_upstream_zone_module.c
@@ -155,7 +155,7 @@ ngx_stream_upstream_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 
     /* 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];