Commit 57c3ef1d authored by Brad King's avatar Brad King
Browse files

Suppress deprecation warnings for GetVersionEx on Intel compiler

In commit 29ffaf43 (Suppress deprecation warnings for GetVersionEx,
2014-09-25) we used #pragma to disable warnings on MSVC.  Update
the logic to use the proper warning number for the Intel compiler.

Change-Id: Idddca1814c645b76f7e823c0028ee2209ee4fb57
parent 425fa73e
...@@ -340,7 +340,11 @@ kwsysProcess* kwsysProcess_New(void) ...@@ -340,7 +340,11 @@ kwsysProcess* kwsysProcess_New(void)
osv.dwOSVersionInfoSize = sizeof(osv); osv.dwOSVersionInfoSize = sizeof(osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
GetVersionEx(&osv); GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
...@@ -2382,7 +2386,11 @@ static kwsysProcess_List* kwsysProcess_List_New(void) ...@@ -2382,7 +2386,11 @@ static kwsysProcess_List* kwsysProcess_List_New(void)
osv.dwOSVersionInfoSize = sizeof(osv); osv.dwOSVersionInfoSize = sizeof(osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
GetVersionEx(&osv); GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
......
...@@ -5069,7 +5069,11 @@ bool SystemInformationImplementation::QueryOSInformation() ...@@ -5069,7 +5069,11 @@ bool SystemInformationImplementation::QueryOSInformation()
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW); osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi); bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi);
if (!bOsVersionInfoEx) if (!bOsVersionInfoEx)
......
...@@ -4732,7 +4732,11 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() ...@@ -4732,7 +4732,11 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif #endif
bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi); bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi);
if (!bOsVersionInfoEx) if (!bOsVersionInfoEx)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment