mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-18 07:37:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win32: MSVC 2013 compatibility.

Browse Source 
Warnings about GetVersionEx() deprecation silenced.  Precompiled object
linked in.
This commit is contained in:
Maxim Dounin 2014-02-13 16:54:00 +04:00
parent b20af091b7
commit 8f8bf842bc
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
auto/cc/msvc
View File

@ -106,6 +106,7 @@ fi
# precompiled headers # precompiled headers
CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch"
CORE_LINK="$NGX_OBJS/ngx_pch.obj"
NGX_PCH="$NGX_OBJS/ngx_config.pch" NGX_PCH="$NGX_OBJS/ngx_config.pch"
NGX_BUILD_PCH="-Ycngx_config.h -Fp$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" NGX_USE_PCH="-Yungx_config.h -Fp$NGX_OBJS/ngx_config.pch"

8
src/os/win32/ngx_win32_init.c
View File

@ -71,6 +71,10 @@ ngx_os_init(ngx_log_t *log)
ngx_memzero(&osvi, sizeof(OSVERSIONINFOEX)); ngx_memzero(&osvi, sizeof(OSVERSIONINFOEX));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
#ifdef _MSC_VER
#pragma warning(disable:4996)
#endif
osviex = GetVersionEx((OSVERSIONINFO *) &osvi); osviex = GetVersionEx((OSVERSIONINFO *) &osvi);
if (osviex == 0) { 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 * Windows 3.1 Win32s 0xxxxx
* *