From f8863cbe540a4034f658efef1010fc07894afb2f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 19 Nov 2013 20:43:04 +0000 Subject: [PATCH] * cygcheck.cc (dump_sysinfo): Revert Windows 8.1 hack. It's not working. Add a (hopefully temporary) comment. --- winsup/utils/ChangeLog | 5 +++++ winsup/utils/cygcheck.cc | 15 ++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 44f420c71..cdda174cb 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2013-11-19 Corinna Vinschen + + * cygcheck.cc (dump_sysinfo): Revert Windows 8.1 hack. It's not + working. Add a (hopefully temporary) comment. + 2013-11-19 Corinna Vinschen * cygcheck.cc (dump_sysinfo): Drop code trying to fetch OSVERSIONINFO diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 87557da04..106577c9c 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -1465,17 +1465,10 @@ dump_sysinfo () ? "7" : "2008 R2"); break; case 2: - /* No way to distinguish W8 and W8.1 by OS version numbers - alone, unless the executables have a matching manifest. - What a big, fat mess. */ - if (osversion.dwBuildNumber < 9200) - { - strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION - ? "8" : "2012"); - break; - } - /*FALLTHRU*/ - case 3: + strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION + ? "8" : "2012"); + break; + case 3: /* Unreached due to mainfest nonsense. */ default: osversion.dwMinorVersion = 3; strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION