diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-07-16 14:20:48 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-07-16 14:20:48 +0300 |
| commit | 6dc03bf1a44169918841797080f903324c6d2165 (patch) | |
| tree | 47a24be3d70801c4495afd89ef27c04fbffa9a97 /src | |
| parent | a2a8bd3bdbf4e496a649012bb6d7f73d2e8a4f3f (diff) | |
| download | nginx-6dc03bf1a44169918841797080f903324c6d2165.tar.gz nginx-6dc03bf1a44169918841797080f903324c6d2165.tar.bz2 | |
Fixed strict aliasing warnings with old GCC versions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_upstream_zone_module.c | 2 | ||||
| -rw-r--r-- | src/stream/ngx_stream_upstream_zone_module.c | 2 |
2 files changed, 2 insertions, 2 deletions
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]; |