RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-10 22:43:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use ::GetVersionEx directly rather than the Win8.1 SDK helpers

Browse Source 
This removes ifdefs and fixes the build for users of the Win8.0 SDK,
which I happen to be. Upgrading is not hard, but executing the same code
everywhere seems better.

llvm-svn: 257379
This commit is contained in:
Reid Kleckner 2016-01-11 20:35:45 +00:00
parent fcaa6caed5
commit 98639cde79
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Support/Windows/WindowsSupport.h
View File

@ -47,11 +47,10 @@
#include <string>
#include <vector>
#if !defined(__CYGWIN__) && !defined(__MINGW32__)
#include <VersionHelpers.h>
#else
// Cygwin does not have the IsWindows8OrGreater() API.
// Some version of mingw does not have the API either.
/// Determines if the program is running on Windows 8 or newer. This
/// reimplements the helpers in the Windows 8.1 SDK, which are intended to
/// supercede raw calls to GetVersionEx, because old Windows SDKs, Cygwin, and
/// MinGW don't have VersionSupport.h yet.
inline bool IsWindows8OrGreater() {
OSVERSIONINFO osvi = {};
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@ -60,7 +59,6 @@ inline bool IsWindows8OrGreater() {
return (osvi.dwMajorVersion > 6 ||
(osvi.dwMajorVersion == 6 && osvi.dwMinorVersion >= 2));
}
#endif // __CYGWIN__
inline bool MakeErrMsg(std::string* ErrMsg, const std::string& prefix) {
if (!ErrMsg)