From 4360f45d7fa242f95aae86a137d56c737798dccf Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 25 Feb 2021 17:42:14 -0700 Subject: [PATCH] std.os: remove special case for haiku This is an accident from a merge conflict introduced in 7edb204edfa41e11776ac009da5a20fb1c907f5f. The new pipe2 code I believe is supposed to work for all posix-like systems. If haiku needs special handling here, it should be re-introduced. --- lib/std/os.zig | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/lib/std/os.zig b/lib/std/os.zig index 6b13ec94c9..24d9041639 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -3892,21 +3892,6 @@ pub fn pipe2(flags: u32) PipeError![2]fd_t { } } } - if (std.Target.current.os.tag == .haiku) { - var fds: [2]fd_t = try pipe(); - if (flags == 0) return fds; - errdefer { - close(fds[0]); - close(fds[1]); - } - for (fds) |fd| switch (errno(system.fcntl(fd, F_SETFL, flags))) { - 0 => {}, - EINVAL => unreachable, // Invalid flags - EBADF => unreachable, // Always a race condition - else => |err| return unexpectedErrno(err), - }; - return fds; - } const new_flags = flags & ~@as(u32, O_CLOEXEC); // Set every other flag affecting the file status using F_SETFL.