Mercurial > hg > nginx

comparison src/os/win32/ngx_win32_config.h @ 6230:2a621245f4cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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().
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 17 Aug 2015 18:09:17 +0300
parents 36d99c042652
children 28a8497bf39c
comparison
equal deleted inserted replaced
6229:2c045e5b8291 6230:2a621245f4cf
18 #define WIN32_LEAN_AND_MEAN 18 #define WIN32_LEAN_AND_MEAN
19 19
20 /* enable getenv() and gmtime() in msvc8 */ 20 /* enable getenv() and gmtime() in msvc8 */
21 #define _CRT_SECURE_NO_WARNINGS 21 #define _CRT_SECURE_NO_WARNINGS
22 #define _CRT_SECURE_NO_DEPRECATE 22 #define _CRT_SECURE_NO_DEPRECATE
23
24 /* enable gethostbyname() in msvc2015 */
25 #if !(NGX_HAVE_INET6)
26 #define _WINSOCK_DEPRECATED_NO_WARNINGS
27 #endif
23 28
24 /* 29 /*
25 * we need to include <windows.h> explicitly before <winsock2.h> because 30 * we need to include <windows.h> explicitly before <winsock2.h> because
26 * the warning 4201 is enabled in <windows.h> 31 * the warning 4201 is enabled in <windows.h>
27 */ 32 */