aboutsummaryrefslogtreecommitdiff
path: root/src/os/win32
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/win32')
-rw-r--r--src/os/win32/ngx_socket.h4
-rw-r--r--src/os/win32/ngx_win32_config.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
index f728da211..a9e26c295 100644
--- a/src/os/win32/ngx_socket.h
+++ b/src/os/win32/ngx_socket.h
@@ -21,9 +21,9 @@ typedef int socklen_t;
#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 --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 36a486fa8..f5b5950bb 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -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>