diff options
| author | Tormod Volden <debian.tormod@gmail.com> | 2022-02-03 23:52:55 +0100 |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2022-03-18 19:08:38 +0100 |
| commit | d6253e94a36d6eeac163268bc4386d1d092e5160 (patch) | |
| tree | 95f52f4320067f189379b0156c0828145fd057ed | |
| parent | c6deb2f345edc90ea975bf2e66e3eb589a878e03 (diff) | |
| download | libusb-d6253e94a36d6eeac163268bc4386d1d092e5160.tar.gz | |
windows: Add Windows 11 to list of defined releases
And guess "12" for whatever comes after. Although with macOS already at
12 this is not given :)
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
| -rw-r--r-- | libusb/os/windows_common.c | 5 | ||||
| -rw-r--r-- | libusb/os/windows_common.h | 3 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libusb/os/windows_common.c b/libusb/os/windows_common.c index eefd01e..e3d93cb 100644 --- a/libusb/os/windows_common.c +++ b/libusb/os/windows_common.c @@ -391,11 +391,12 @@ static enum windows_version get_windows_version(void) case 0x63: winver = WINDOWS_8_1; w = (ws ? "8.1" : "2012_R2"); break; case 0x64: // Early Windows 10 Insider Previews and Windows Server 2017 Technical Preview 1 used version 6.4 case 0xA0: winver = WINDOWS_10; w = (ws ? "10" : "2016"); break; + case 0xB0: winver = WINDOWS_11; w = (ws ? "11" : "2022"); break; default: if (version < 0x50) return WINDOWS_UNDEFINED; - winver = WINDOWS_11_OR_LATER; - w = "11 or later"; + winver = WINDOWS_12_OR_LATER; + w = "12 or later"; } arch = is_x64() ? "64-bit" : "32-bit"; diff --git a/libusb/os/windows_common.h b/libusb/os/windows_common.h index 792a31e..4582ce4 100644 --- a/libusb/os/windows_common.h +++ b/libusb/os/windows_common.h @@ -153,7 +153,8 @@ enum windows_version { WINDOWS_8, WINDOWS_8_1, WINDOWS_10, - WINDOWS_11_OR_LATER + WINDOWS_11, + WINDOWS_12_OR_LATER }; extern enum windows_version windows_version; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 65127d8..375e693 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11703 +#define LIBUSB_NANO 11704 |