authorgravatar for johnnymarler@gmail.comJonathan Marler <johnnymarler@gmail.com> 2021-10-16 18:51:50-06:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-17 16:07:51-04:00
log22beaf5afcfb4c9c29016f19f363a24f159b5b82
tree2d5a7e8fccc0e964416e477d0566a19842a9ca1c
parent51be575745adfe21a5367f206c156f2d589ad436

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.

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

lib/std/child_process.zig+1-1
......@@ -354,7 +354,7 @@ pub const ChildProcess = struct {
354354
355355 // TODO collect output in a deadlock-avoiding way on Windows.
356356 // https://github.com/ziglang/zig/issues/6343
357 if (builtin.os.tag == .windows or builtin.os.tag == .haiku) {
357 if (builtin.os.tag == .haiku) {
358358 const stdout_in = child.stdout.?.reader();
359359 const stderr_in = child.stderr.?.reader();
360360