diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2007-02-20 19:41:54 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2007-02-20 19:41:54 +0300 |
commit | 7db9fabc836e4bc56f47a31c9764c193f89bddfc (patch) | |
tree | e361ea2c9f1a3fd44d40326399c137afe803d19e /winsup | |
parent | 8fbd574ef065d5d71c933bbb76d8817300fbb487 (diff) |
* cygcheck.cc (dump_sysinfo): Add "not supported" to osname on 9x
machines. Drop "not supported" for Vista. Drop "Longhorn" text
for now.
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
-rw-r--r-- | winsup/utils/cygcheck.cc | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 04d86d45e..fbc4cf51a 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -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> * cygpath.cc (usage): Add -O and -F, remove tabs. diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index 62f185f8c..94498aa4e 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -1,7 +1,7 @@ /* cygcheck.cc Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006 Red Hat, Inc. + 2006, 2007 Red Hat, Inc. This file is part of Cygwin. @@ -1148,29 +1148,23 @@ dump_sysinfo () switch (osversion.dwMinorVersion) { case 0: - if (strchr (osversion.szCSDVersion, 'C')) - osname = "95 OSR2"; - else - osname = "95"; + osname = "95 (not supported)"; break; case 10: - if (strchr (osversion.szCSDVersion, 'A')) - osname = "98 SE"; - else - osname = "98"; + osname = "98 (not supported)"; break; case 90: - osname = "ME"; + osname = "ME (not supported)"; break; default: - osname = "9X"; + osname = "9X (not supported)"; break; } break; case VER_PLATFORM_WIN32_NT: is_nt = true; if (osversion.dwMajorVersion == 6) - osname = "Longhorn/Vista (not yet supported!)"; + osname = "Vista"; else if (osversion.dwMajorVersion == 5) { BOOL more_info = FALSE; |