summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-02-07 20:17:38 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-02-07 20:17:38 +0000
commit282b652028ca79baa5a43aa5356d779a688947a8 (patch)
tree66205f73da3a22532dc0defa6132778e258ded8e /plugin
parentd995dd2865b4dd5d01175594ed667cfe8ce41712 (diff)
downloadmariadb-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 'plugin')
-rw-r--r--plugin/feedback/utils.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc
index 09abbb2de23..87893924b38 100644
--- a/plugin/feedback/utils.cc
+++ b/plugin/feedback/utils.cc
@@ -92,6 +92,9 @@ static int uname(struct utsname *buf)
{
OSVERSIONINFOEX ver;
ver.dwOSVersionInfoSize = (DWORD)sizeof(ver);
+#ifdef _MSC_VER
+#pragma warning (disable : 4996)
+#endif
if (!GetVersionEx((OSVERSIONINFO *)&ver))
return -1;