Mercurial > hg > nginx
changeset 5577:bfe536716dbf
Win32: MSVC 2013 compatibility.
Warnings about GetVersionEx() deprecation silenced. Precompiled object
linked in.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 13 Feb 2014 16:54:00 +0400 |
parents | 2bc609a4b516 |
children | e280ece17020 |
files | auto/cc/msvc src/os/win32/ngx_win32_init.c |
diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/cc/msvc Wed Feb 12 21:02:29 2014 +0400 +++ b/auto/cc/msvc Thu Feb 13 16:54:00 2014 +0400 @@ -106,6 +106,7 @@ # precompiled headers CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" +CORE_LINK="$NGX_OBJS/ngx_pch.obj" NGX_PCH="$NGX_OBJS/ngx_config.pch" NGX_BUILD_PCH="-Ycngx_config.h -Fp$NGX_OBJS/ngx_config.pch" NGX_USE_PCH="-Yungx_config.h -Fp$NGX_OBJS/ngx_config.pch"
--- a/src/os/win32/ngx_win32_init.c Wed Feb 12 21:02:29 2014 +0400 +++ b/src/os/win32/ngx_win32_init.c Thu Feb 13 16:54:00 2014 +0400 @@ -71,6 +71,10 @@ ngx_memzero(&osvi, sizeof(OSVERSIONINFOEX)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); +#ifdef _MSC_VER +#pragma warning(disable:4996) +#endif + osviex = GetVersionEx((OSVERSIONINFO *) &osvi); if (osviex == 0) { @@ -82,6 +86,10 @@ } } +#ifdef _MSC_VER +#pragma warning(default:4996) +#endif + /* * Windows 3.1 Win32s 0xxxxx *