* cygcheck.cc (dump_sysinfo): Add "not supported" to osname on 9x

machines.  Drop "not supported" for Vista.  Drop "Longhorn" text
	for now.
This commit is contained in:
Corinna Vinschen 2007-02-20 16:41:54 +00:00
parent 8fbd574ef0
commit 7db9fabc83
2 changed files with 12 additions and 12 deletions

View File

@ -1,3 +1,9 @@
2007-02-20 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (dump_sysinfo): Add "not supported" to osname on 9x
machines. Drop "not supported" for Vista. Drop "Longhorn" text
for now.
2007-01-09 Christian Franke <franke@computer.org> 2007-01-09 Christian Franke <franke@computer.org>
* cygpath.cc (usage): Add -O and -F, remove tabs. * cygpath.cc (usage): Add -O and -F, remove tabs.

View File

@ -1,7 +1,7 @@
/* cygcheck.cc /* cygcheck.cc
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006 Red Hat, Inc. 2006, 2007 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -1148,29 +1148,23 @@ dump_sysinfo ()
switch (osversion.dwMinorVersion) switch (osversion.dwMinorVersion)
{ {
case 0: case 0:
if (strchr (osversion.szCSDVersion, 'C')) osname = "95 (not supported)";
osname = "95 OSR2";
else
osname = "95";
break; break;
case 10: case 10:
if (strchr (osversion.szCSDVersion, 'A')) osname = "98 (not supported)";
osname = "98 SE";
else
osname = "98";
break; break;
case 90: case 90:
osname = "ME"; osname = "ME (not supported)";
break; break;
default: default:
osname = "9X"; osname = "9X (not supported)";
break; break;
} }
break; break;
case VER_PLATFORM_WIN32_NT: case VER_PLATFORM_WIN32_NT:
is_nt = true; is_nt = true;
if (osversion.dwMajorVersion == 6) if (osversion.dwMajorVersion == 6)
osname = "Longhorn/Vista (not yet supported!)"; osname = "Vista";
else if (osversion.dwMajorVersion == 5) else if (osversion.dwMajorVersion == 5)
{ {
BOOL more_info = FALSE; BOOL more_info = FALSE;