Mercurial > hg > nginx

changeset 6214:341e4303d25b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed strict aliasing warnings with old GCC versions.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 16 Jul 2015 14:20:48 +0300
parents 7cad953621d4
children 8ee6a08ea3eb
files src/http/modules/ngx_http_upstream_zone_module.c src/stream/ngx_stream_upstream_zone_module.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
     /* 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];
--- 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_zo
 
     /* 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];