public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: update cygcheck OS information
Date: Thu, 21 Oct 2021 16:35:33 +0000 (GMT) [thread overview]
Message-ID: <20211021163533.DB23A3858405@sourceware.org> (raw)
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,
reply other threads:[~2021-10-21 16:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211021163533.DB23A3858405@sourceware.org \
--to=corinna@sourceware.org \
--cc=cygwin-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).