]> git.kaiwu.me - nginx.git/commitdiff
Fixed strict aliasing warnings with old GCC versions.
authorRuslan Ermilov <ru@nginx.com>
Thu, 16 Jul 2015 11:20:48 +0000 (14:20 +0300)
committerRuslan Ermilov <ru@nginx.com>
Thu, 16 Jul 2015 11:20:48 +0000 (14:20 +0300)
src/http/modules/ngx_http_upstream_zone_module.c
src/stream/ngx_stream_upstream_zone_module.c

index 7169c365e4538630dc950e712d1a082798790a2b..7e5bd74764e1c60551d14529ca6589ffd9f8d900 100644 (file)
@@ -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];
index 87ddc03d5332876b0e856d76fbb0ddcd3eff90a1..ffc9e8a69a9f1eb74a3c519e0a75df55f57db9d1 100644 (file)
@@ -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];