diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:17:38 +0000 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:17:38 +0000 |
commit | 282b652028ca79baa5a43aa5356d779a688947a8 (patch) | |
tree | 66205f73da3a22532dc0defa6132778e258ded8e /sql/nt_servc.cc | |
parent | d995dd2865b4dd5d01175594ed667cfe8ce41712 (diff) | |
download | mariadb-git-282b652028ca79baa5a43aa5356d779a688947a8.tar.gz |
Windows, compiling : reenable warning C4996 (deprecated functions)
But set _CRT_NONSTDC_NO_WARNINGS to silence silly warnings about
ANSI C function being non-standard
Remove now deprecated GetVersion()/GetVersionEx(),except single case
where where it is really needed, in feedback plugin. Remove checks for
Windows NT.
Avoid old IPv4-only inet_aton, which generated the warning.
Diffstat (limited to 'sql/nt_servc.cc')
-rw-r--r-- | sql/nt_servc.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc index e05e43a0a59..654383c3320 100644 --- a/sql/nt_servc.cc +++ b/sql/nt_servc.cc @@ -64,19 +64,6 @@ NTService::~NTService() -------------------------------------------------------------------------- */ -BOOL NTService::GetOS() -{ - bOsNT = FALSE; - memset(&osVer, 0, sizeof(OSVERSIONINFO)); - osVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (GetVersionEx(&osVer)) - { - if (osVer.dwPlatformId == VER_PLATFORM_WIN32_NT) - bOsNT = TRUE; - } - return bOsNT; -} - /** Registers the main service thread with the service manager. |