diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2014-09-25 12:49:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-26 13:34:21 (GMT) |
| commit | a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd (patch) | |
| tree | 3a943ae63db55d0597a5dbbd797fdd94951a7270 /SystemTools.cxx | |
| parent | 92b582a67e3ea29d7a958952c0a3dfd7706b2c9f (diff) | |
| download | CMake-a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd.zip CMake-a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd.tar.gz CMake-a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd.tar.bz2 | |
KWSys 2014-09-25 (29ffaf43)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 29ffaf43 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' fb77be5a..29ffaf43
Brad King (1):
29ffaf43 Suppress deprecation warnings for GetVersionEx
Sean McBride (1):
6aa1f800 SystemInformation: Fix clang -Wtautological-pointer-compare warning
Change-Id: I29f3dcf2a32e1b80bade233987eb091038aace65
Diffstat (limited to 'SystemTools.cxx')
| -rw-r--r-- | SystemTools.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/SystemTools.cxx b/SystemTools.cxx index 8a61267..b1221e3 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -82,6 +82,9 @@ # ifndef INVALID_FILE_ATTRIBUTES # define INVALID_FILE_ATTRIBUTES ((DWORD)-1) # endif +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# endif #elif defined (__CYGWIN__) # include <windows.h> # undef _WIN32 @@ -4629,6 +4632,10 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() ZeroMemory(&osvi, sizeof(OSVERSIONINFOEXA)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (push) +# pragma warning (disable:4996) +#endif bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi); if (!bOsVersionInfoEx) { @@ -4638,6 +4645,9 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() return 0; } } +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (pop) +#endif switch (osvi.dwPlatformId) { |