merge 5.1

089119ca · Vladislav Vaintroub · cbae2943 · 3fa35610 · 089119ca
Commit 089119ca authored Nov 22, 2012 by Vladislav Vaintroub
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

plugin/feedback/utils.cc plugin/feedback/utils.cc +6 -0

No files found.
--- a/plugin/feedback/utils.cc
+++ b/plugin/feedback/utils.cc
@@ -44,6 +44,12 @@ static const char *get_os_version_name(OSVERSIONINFOEX *ver)
  DWORD major = ver->dwMajorVersion;
  DWORD minor = ver->dwMinorVersion;
+  if (major == 6 && minor == 2)
+  {
+    return (ver->wProductType == VER_NT_WORKSTATION)?
+      "Windows 8":"Windows Server 2012";    
+  }
  if (major == 6 && minor == 1)
  {
    return (ver->wProductType == VER_NT_WORKSTATION)?