authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-04-06 13:58:54-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-04-06 13:58:54-07:00
log9f957184a13fd39b74b978a8eb19b4c9eb6afa09
treee42d988f0a3ca9e751aa57b71d507fa65603985e
parent271f24f0477ab5d79b803bf895cb75be58571a2e
parent8853005672374ceac8760548027a03fa284bf2d1

Merge remote-tracking branch 'origin/master' into llvm16

1 files changed, 2 insertions(+), 1 deletions(-)

lib/std/process.zig+2-1
...@@ -1164,7 +1164,8 @@ pub fn totalSystemMemory() TotalSystemMemoryError!usize {...@@ -1164,7 +1164,8 @@ pub fn totalSystemMemory() TotalSystemMemoryError!usize {
1164 },1164 },
1165 .windows => {1165 .windows => {
1166 var kilobytes: std.os.windows.ULONGLONG = undefined;1166 var kilobytes: std.os.windows.ULONGLONG = undefined;
1167 assert(std.os.windows.kernel32.GetPhysicallyInstalledSystemMemory(&kilobytes) == std.os.windows.TRUE);1167 if (std.os.windows.kernel32.GetPhysicallyInstalledSystemMemory(&kilobytes) != std.os.windows.TRUE)
1168 return error.UnknownTotalSystemMemory;
1168 return kilobytes * 1024;1169 return kilobytes * 1024;
1169 },1170 },
1170 else => return error.UnknownTotalSystemMemory,1171 else => return error.UnknownTotalSystemMemory,