diff options
| author |  laszlocsomor <laszlocsomor@google.com> | 2017-03-29 09:36:30 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-03-29 14:22:55 +0200 |
| commit | 704fb6642291ee644ca174f5593cbd4ee76861ce (patch) | |
| tree | 00647c947ba5e93c93bc176139dbe2177d35e3f0 /src/main/cpp | |
| parent | ceb0d88ad95e5f636f687cffa6c157293455b37e (diff) | |
Bazel client, Windows: fix version check []
GetVersionEx is discouraged by MSDN, so use the
recommended method to check the Windows version.
PiperOrigin-RevId: 151553827
Diffstat (limited to 'src/main/cpp')
| -rw-r--r-- | src/main/cpp/blaze_util_windows.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/main/cpp/blaze_util_windows.cc b/src/main/cpp/blaze_util_windows.cc index 0b4f52dacd..8e1d32907e 100644 --- a/src/main/cpp/blaze_util_windows.cc +++ b/src/main/cpp/blaze_util_windows.cc @@ -26,8 +26,9 @@ #include <unistd.h> #endif // COMPILER_MSVC -#include <lmcons.h> // UNLEN #include <windows.h> +#include <lmcons.h> // UNLEN +#include <versionhelpers.h> // IsWindows8OrGreater #ifdef COMPILER_MSVC #include <io.h> // _open @@ -812,16 +813,7 @@ static bool IsFailureDueToNestedJobsNotSupported(HANDLE process) { // Not in a job. return false; } - - OSVERSIONINFOEX version_info; - version_info.dwOSVersionInfoSize = sizeof(version_info); - if (!GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info))) { - PrintError("GetVersionEx()"); - return false; - } - - return version_info.dwMajorVersion < 6 - || version_info.dwMajorVersion == 6 && version_info.dwMinorVersion <= 1; + return !IsWindows8OrGreater(); } // Run the given program in the current working directory, using the given |