diff options
author | Berke Viktor <github.bviktor@outlook.com> | 2015-02-04 04:48:44 -0800 |
---|---|---|
committer | Berke Viktor <github.bviktor@outlook.com> | 2015-02-04 04:48:44 -0800 |
commit | a216ed1df9394325bc573cd3f1693eb467a89938 (patch) | |
tree | 8cd5373d30c3906840c40d4a60a824c05de27360 | |
parent | afee9fd42b95274d71c76351349b9bf2090632c5 (diff) |
Partial fix for Windows 10 detection
-rw-r--r-- | src/common/util.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c index 37d214c0..d650c820 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -500,7 +500,22 @@ get_sys_str (int with_cpu) static char winver[20]; double mhz; - if (IsWindows8Point1OrGreater ()) + /* Broken since major bumped to 10, should start to work eventually. + * No, IsWindowsVersionOrGreater (10, 0, 0) doesn't work either. + * TODO: replace with IsWindows10OrGreater() once added to the SDK. + */ + if (IsWindowsVersionOrGreater (6, 4, 0)) + { + if (IsWindowsServer ()) + { + strcpy (winver, "Server 10"); + } + else + { + strcpy (winver, "10"); + } + } + else if (IsWindows8Point1OrGreater ()) { if (IsWindowsServer ()) { |