mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-kwsys' into update-kwsys

Browse Source
This commit is contained in:
Brad King
2015-01-21 09:15:44 -05:00
parent f709776864 77444a7d48
commit 7e468cd8f9
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/kwsys/ProcessWin32.c
+10 -2
View File
@@ -340,7 +340,11 @@ kwsysProcess* kwsysProcess_New(void)
osv.dwOSVersionInfoSize = sizeof(osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push)
# pragma warning (disable:4996)
# ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif
GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
@@ -2382,7 +2386,11 @@ static kwsysProcess_List* kwsysProcess_List_New(void)
osv.dwOSVersionInfoSize = sizeof(osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push)
# pragma warning (disable:4996)
# ifdef __INTEL_COMPILER
# pragma warning (disable:1478)
# else
# pragma warning (disable:4996)
# endif
#endif
GetVersionEx(&osv);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx