Mercurial > hg > nginx

comparison src/os/win32/ngx_win32_init.c @ 5577:bfe536716dbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b91bcba29351
children 1209b8a7b077
comparison
equal deleted inserted replaced
5576:2bc609a4b516 5577:bfe536716dbf
69 /* get Windows version */ 69 /* get Windows version */
70 70
71 ngx_memzero(&osvi, sizeof(OSVERSIONINFOEX)); 71 ngx_memzero(&osvi, sizeof(OSVERSIONINFOEX));
72 osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); 72 osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
73 73
74 #ifdef _MSC_VER
75 #pragma warning(disable:4996)
76 #endif
77
74 osviex = GetVersionEx((OSVERSIONINFO *) &osvi); 78 osviex = GetVersionEx((OSVERSIONINFO *) &osvi);
75 79
76 if (osviex == 0) { 80 if (osviex == 0) {
77 osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); 81 osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
78 if (GetVersionEx((OSVERSIONINFO *) &osvi) == 0) { 82 if (GetVersionEx((OSVERSIONINFO *) &osvi) == 0) {
79 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, 83 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
80 "GetVersionEx() failed"); 84 "GetVersionEx() failed");
81 return NGX_ERROR; 85 return NGX_ERROR;
82 } 86 }
83 } 87 }
88
89 #ifdef _MSC_VER
90 #pragma warning(default:4996)
91 #endif
84 92
85 /* 93 /*
86 * Windows 3.1 Win32s 0xxxxx 94 * Windows 3.1 Win32s 0xxxxx
87 * 95 *
88 * Windows 95 140000 96 * Windows 95 140000