aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-04-06 13:58:54 -0700
committerAndrew Kelley <andrew@ziglang.org>2023-04-06 13:58:54 -0700
commit9f957184a13fd39b74b978a8eb19b4c9eb6afa09 (patch)
treee42d988f0a3ca9e751aa57b71d507fa65603985e /lib
parent271f24f0477ab5d79b803bf895cb75be58571a2e (diff)
parent8853005672374ceac8760548027a03fa284bf2d1 (diff)
downloadzig-9f957184a13fd39b74b978a8eb19b4c9eb6afa09.tar.gz
zig-9f957184a13fd39b74b978a8eb19b4c9eb6afa09.zip
Merge remote-tracking branch 'origin/master' into llvm16
Diffstat (limited to 'lib')
-rw-r--r--lib/std/process.zig3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/std/process.zig b/lib/std/process.zig
index f870b85774..096f1f666d 100644
--- a/lib/std/process.zig
+++ b/lib/std/process.zig
@@ -1164,7 +1164,8 @@ pub fn totalSystemMemory() TotalSystemMemoryError!usize {
},
.windows => {
var kilobytes: std.os.windows.ULONGLONG = undefined;
- assert(std.os.windows.kernel32.GetPhysicallyInstalledSystemMemory(&kilobytes) == std.os.windows.TRUE);
+ if (std.os.windows.kernel32.GetPhysicallyInstalledSystemMemory(&kilobytes) != std.os.windows.TRUE)
+ return error.UnknownTotalSystemMemory;
return kilobytes * 1024;
},
else => return error.UnknownTotalSystemMemory,