# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1439824157 -10800
# Node ID 2a621245f4cf7345b0066124a881b445f35dcf79
# Parent  2c045e5b829191a741a6300ad738b01b812b791a
Win32: MSVC 2015 compatibility.

Resolved warnings about declarations that hide previous local declarations.
Warnings about WSASocketA() being deprecated resolved by explicit use of
WSASocketW() instead of WSASocket().  When compiling without IPv6 support,
WinSock deprecated warnings are disabled to allow use of gethostbyname().

diff -r 2c045e5b8291 -r 2a621245f4cf src/http/modules/ngx_http_fastcgi_module.c
--- a/src/http/modules/ngx_http_fastcgi_module.c	Mon Aug 17 17:42:02 2015 +0300
+++ b/src/http/modules/ngx_http_fastcgi_module.c	Mon Aug 17 18:09:17 2015 +0300
@@ -1770,7 +1770,6 @@
 #if (NGX_HTTP_CACHE)
 
         if (f->large_stderr && r->cache) {
-            u_char                     *start;
             ssize_t                     len;
             ngx_http_fastcgi_header_t  *fh;
 
diff -r 2c045e5b8291 -r 2a621245f4cf src/http/modules/ngx_http_map_module.c
--- a/src/http/modules/ngx_http_map_module.c	Mon Aug 17 17:42:02 2015 +0300
+++ b/src/http/modules/ngx_http_map_module.c	Mon Aug 17 18:09:17 2015 +0300
@@ -375,7 +375,7 @@
 static char *
 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
 {
-    ngx_int_t                   rc, index;
+    ngx_int_t                   rv, index;
     ngx_str_t                  *value, name;
     ngx_uint_t                  i, key;
     ngx_http_map_conf_ctx_t    *ctx;
@@ -546,19 +546,19 @@
         value[0].data++;
     }
 
-    rc = ngx_hash_add_key(&ctx->keys, &value[0], var,
+    rv = ngx_hash_add_key(&ctx->keys, &value[0], var,
                           (ctx->hostnames) ? NGX_HASH_WILDCARD_KEY : 0);
 
-    if (rc == NGX_OK) {
+    if (rv == NGX_OK) {
         return NGX_CONF_OK;
     }
 
-    if (rc == NGX_DECLINED) {
+    if (rv == NGX_DECLINED) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid hostname or wildcard \"%V\"", &value[0]);
     }
 
-    if (rc == NGX_BUSY) {
+    if (rv == NGX_BUSY) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "conflicting parameter \"%V\"", &value[0]);
     }
diff -r 2c045e5b8291 -r 2a621245f4cf src/mail/ngx_mail_core_module.c
--- a/src/mail/ngx_mail_core_module.c	Mon Aug 17 17:42:02 2015 +0300
+++ b/src/mail/ngx_mail_core_module.c	Mon Aug 17 18:09:17 2015 +0300
@@ -434,8 +434,7 @@
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            struct sockaddr  *sa;
-            u_char            buf[NGX_SOCKADDR_STRLEN];
+            u_char  buf[NGX_SOCKADDR_STRLEN];
 
             sa = &ls->u.sockaddr;
 
diff -r 2c045e5b8291 -r 2a621245f4cf src/os/win32/ngx_socket.h
--- a/src/os/win32/ngx_socket.h	Mon Aug 17 17:42:02 2015 +0300
+++ b/src/os/win32/ngx_socket.h	Mon Aug 17 18:09:17 2015 +0300
@@ -21,9 +21,9 @@
 
 
 #define ngx_socket(af, type, proto)                                          \
-    WSASocket(af, type, proto, NULL, 0, WSA_FLAG_OVERLAPPED)
+    WSASocketW(af, type, proto, NULL, 0, WSA_FLAG_OVERLAPPED)
 
-#define ngx_socket_n        "WSASocket()"
+#define ngx_socket_n        "WSASocketW()"
 
 int ngx_nonblocking(ngx_socket_t s);
 int ngx_blocking(ngx_socket_t s);
diff -r 2c045e5b8291 -r 2a621245f4cf src/os/win32/ngx_win32_config.h
--- a/src/os/win32/ngx_win32_config.h	Mon Aug 17 17:42:02 2015 +0300
+++ b/src/os/win32/ngx_win32_config.h	Mon Aug 17 18:09:17 2015 +0300
@@ -21,6 +21,11 @@
 #define _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_DEPRECATE
 
+/* enable gethostbyname() in msvc2015 */
+#if !(NGX_HAVE_INET6)
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+#endif
+
 /*
  * we need to include <windows.h> explicitly before <winsock2.h> because
  * the warning 4201 is enabled in <windows.h>
diff -r 2c045e5b8291 -r 2a621245f4cf src/stream/ngx_stream_core_module.c
--- a/src/stream/ngx_stream_core_module.c	Mon Aug 17 17:42:02 2015 +0300
+++ b/src/stream/ngx_stream_core_module.c	Mon Aug 17 18:09:17 2015 +0300
@@ -372,8 +372,7 @@
 
         if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
-            struct sockaddr  *sa;
-            u_char            buf[NGX_SOCKADDR_STRLEN];
+            u_char  buf[NGX_SOCKADDR_STRLEN];
 
             sa = &ls->u.sockaddr;
 
diff -r 2c045e5b8291 -r 2a621245f4cf src/stream/ngx_stream_proxy_module.c
--- a/src/stream/ngx_stream_proxy_module.c	Mon Aug 17 17:42:02 2015 +0300
+++ b/src/stream/ngx_stream_proxy_module.c	Mon Aug 17 18:09:17 2015 +0300
@@ -528,18 +528,18 @@
     c = s->connection;
 
     if (c->log->log_level >= NGX_LOG_INFO) {
-        ngx_str_t  s;
+        ngx_str_t  str;
         u_char     addr[NGX_SOCKADDR_STRLEN];
 
-        s.len = NGX_SOCKADDR_STRLEN;
-        s.data = addr;
+        str.len = NGX_SOCKADDR_STRLEN;
+        str.data = addr;
 
-        if (ngx_connection_local_sockaddr(pc, &s, 1) == NGX_OK) {
+        if (ngx_connection_local_sockaddr(pc, &str, 1) == NGX_OK) {
             handler = c->log->handler;
             c->log->handler = NULL;
 
             ngx_log_error(NGX_LOG_INFO, c->log, 0, "proxy %V connected to %V",
-                          &s, u->peer.name);
+                          &str, u->peer.name);
 
             c->log->handler = handler;
         }