Skip to content

Commit 278f0f8

Browse files
committed
Change how the build-id is checked
Address review comment by @rocksnest
1 parent 5822220 commit 278f0f8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/std/zig/system.zig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,20 +239,20 @@ pub const NativeTargetInfo = struct {
239239
@intCast(u16, version_info.dwMajorVersion & 0xff) << 8 |
240240
@intCast(u16, version_info.dwMinorVersion & 0xff);
241241
const sp_ver: u8 = 0;
242-
const sub_ver: u8 = if (os_ver >= 0xA000) subver: {
242+
const sub_ver: u8 = if (os_ver >= 0x0A00) subver: {
243243
// There's no other way to obtain this info beside
244244
// checking the build number against a known set of
245245
// values
246246
const known_build_numbers = [_]u32{
247247
10240, 10586, 14393, 15063, 16299, 17134, 17763,
248248
18362, 18363,
249249
};
250+
var last_idx: usize = 0;
250251
for (known_build_numbers) |build, i| {
251-
if (version_info.dwBuildNumber < build)
252-
break :subver @truncate(u8, i);
252+
if (version_info.dwBuildNumber >= build)
253+
last_idx = i;
253254
}
254-
// Unknown subversion, the OS is too new...
255-
break :subver @truncate(u8, known_build_numbers.len);
255+
break :subver @truncate(u8, last_idx);
256256
} else 0;
257257

258258
const version: u32 = @as(u32, os_ver) << 16 | @as(u32, sp_ver) << 8 | sub_ver;

0 commit comments

Comments
 (0)