Mercurial > hg > nginx
changeset 4630:f39138a69e0a
Fixed win32 build after changes in r4624.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 15 May 2012 08:10:59 +0000 |
parents | e813c113ef19 |
children | a57537afd6ff |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Mon May 14 16:30:33 2012 +0000 +++ b/src/http/ngx_http_core_module.c Tue May 15 08:10:59 2012 +0000 @@ -2704,7 +2704,7 @@ u_char *xff, size_t xfflen, ngx_array_t *proxies, int recursive) { u_char *p; - in_addr_t *inaddr; + in_addr_t inaddr; ngx_addr_t paddr; ngx_cidr_t *cidr; ngx_uint_t family, i; @@ -2714,7 +2714,7 @@ #endif #if (NGX_SUPPRESS_WARN) - inaddr = NULL; + inaddr = 0; #if (NGX_HAVE_INET6) inaddr6 = NULL; #endif @@ -2723,7 +2723,7 @@ family = addr->sockaddr->sa_family; if (family == AF_INET) { - inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; + inaddr = ((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; } #if (NGX_HAVE_INET6) @@ -2732,7 +2732,7 @@ if (IN6_IS_ADDR_V4MAPPED(inaddr6)) { family = AF_INET; - inaddr = (in_addr_t *) &inaddr6->s6_addr[12]; + inaddr = *(in_addr_t *) &inaddr6->s6_addr[12]; } } #endif @@ -2762,7 +2762,7 @@ #endif default: /* AF_INET */ - if ((*inaddr & cidr[i].u.in.mask) != cidr[i].u.in.addr) { + if ((inaddr & cidr[i].u.in.mask) != cidr[i].u.in.addr) { goto next; } break;