From 22beaf5afcfb4c9c29016f19f363a24f159b5b82 Mon Sep 17 00:00:00 2001 From: Jonathan Marler Date: Sat, 16 Oct 2021 18:51:50 -0600 Subject: [PATCH] actually fix child process deadlock on windows Looks like I forgot to remove windows from this workaround condition when I finished implementing the child process output collection on windows. --- lib/std/child_process.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/std/child_process.zig b/lib/std/child_process.zig index 978a45a2ccdc967cb5b86e908d04a2e0b90b37cc..adc7b9e7c0833577153616f07a331c3b4f2656a1 100644 --- a/lib/std/child_process.zig +++ b/lib/std/child_process.zig @@ -354,7 +354,7 @@ pub const ChildProcess = struct { // TODO collect output in a deadlock-avoiding way on Windows. // https://github.com/ziglang/zig/issues/6343 - if (builtin.os.tag == .windows or builtin.os.tag == .haiku) { + if (builtin.os.tag == .haiku) { const stdout_in = child.stdout.?.reader(); const stderr_in = child.stderr.?.reader(); -- 2.54.0