Win32: MSVC 2013 compatibility.

Warnings about GetVersionEx() deprecation silenced.  Precompiled object
linked in.

diff --git a/auto/cc/msvc b/auto/cc/msvc
index 1bf675e19e93cda8dae6ea6f345254bcbe9ee8b3..6cb8b3d58b3262476a4790824d8c6af66ac47225 100644 (file)
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -106,6 +106,7 @@ fi
 
 # 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"

diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c
index d3cc376030831306389fd017143706e5fc272f84..f7153fcc418be77a5f5589b1ea05979cb5ada88b 100644 (file)
--- a/src/os/win32/ngx_win32_init.c
+++ b/src/os/win32/ngx_win32_init.c
@@ -71,6 +71,10 @@ ngx_os_init(ngx_log_t *log)
     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 @@ ngx_os_init(ngx_log_t *log)
         }
     }
 
+#ifdef _MSC_VER
+#pragma warning(default:4996)
+#endif
+
     /*
      *  Windows 3.1 Win32s   0xxxxx
      *