public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: update cygcheck OS information
@ 2021-10-21 16:35 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2021-10-21 16:35 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=548f124698774222b011aac2796c766efed83091
commit 548f124698774222b011aac2796c766efed83091
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Thu Oct 21 18:33:35 2021 +0200
Cygwin: update cygcheck OS information
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/utils/mingw/cygcheck.cc | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/winsup/utils/mingw/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc
index d818a1907..288a718bc 100644
--- a/winsup/utils/mingw/cygcheck.cc
+++ b/winsup/utils/mingw/cygcheck.cc
@@ -1418,8 +1418,19 @@ dump_sysinfo ()
}
else if (osversion.dwMajorVersion == 10)
{
- strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION
- ? "10" : "2016");
+ if (osversion.wProductType == VER_NT_WORKSTATION)
+ strcpy (osname, osversion.dwBuildNumber >= 22000 ? "11" : "10");
+ else
+ {
+ if (osversion.dwBuildNumber <= 14393)
+ strcpy (osname, "2016");
+ else if (osversion.dwBuildNumber <= 17763)
+ strcpy (osname, "2019");
+ else if (osversion.dwBuildNumber <= 20348)
+ strcpy (osname, "2022");
+ else
+ strcpy (osname, "20??");
+ }
}
DWORD prod;
if (GetProductInfo (osversion.dwMajorVersion,
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-10-21 16:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-21 16:35 [newlib-cygwin] Cygwin: update cygcheck OS information Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).