From 76bceb240d837d859378e01cc5a40b00cb6aacdb Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Sun, 13 Mar 2022 17:03:04 +0100
Subject: std+macho: revert and fix exposing Mach wrappers in std.os and std.c

---
 src/link/MachO.zig | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index c2e981a038..1a4bb804b8 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -4,7 +4,6 @@ const std = @import("std");
 const build_options = @import("build_options");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
-const darwin = std.os.darwin;
 const fmt = std.fmt;
 const fs = std.fs;
 const log = std.log.scoped(.link);
@@ -4344,8 +4343,8 @@ fn populateMissingMetadata(self: *MachO) !void {
                     .vmaddr = pagezero_vmsize,
                     .vmsize = needed_size,
                     .filesize = needed_size,
-                    .maxprot = darwin.PROT.READ | darwin.PROT.EXEC,
-                    .initprot = darwin.PROT.READ | darwin.PROT.EXEC,
+                    .maxprot = macho.PROT.READ | macho.PROT.EXEC,
+                    .initprot = macho.PROT.READ | macho.PROT.EXEC,
                 },
             },
         });
@@ -4449,8 +4448,8 @@ fn populateMissingMetadata(self: *MachO) !void {
                     .vmsize = needed_size,
                     .fileoff = fileoff,
                     .filesize = needed_size,
-                    .maxprot = darwin.PROT.READ | darwin.PROT.WRITE,
-                    .initprot = darwin.PROT.READ | darwin.PROT.WRITE,
+                    .maxprot = macho.PROT.READ | macho.PROT.WRITE,
+                    .initprot = macho.PROT.READ | macho.PROT.WRITE,
                 },
             },
         });
@@ -4498,8 +4497,8 @@ fn populateMissingMetadata(self: *MachO) !void {
                     .vmsize = needed_size,
                     .fileoff = fileoff,
                     .filesize = needed_size,
-                    .maxprot = darwin.PROT.READ | darwin.PROT.WRITE,
-                    .initprot = darwin.PROT.READ | darwin.PROT.WRITE,
+                    .maxprot = macho.PROT.READ | macho.PROT.WRITE,
+                    .initprot = macho.PROT.READ | macho.PROT.WRITE,
                 },
             },
         });
@@ -4607,8 +4606,8 @@ fn populateMissingMetadata(self: *MachO) !void {
                     .segname = makeStaticString("__LINKEDIT"),
                     .vmaddr = vmaddr,
                     .fileoff = fileoff,
-                    .maxprot = darwin.PROT.READ,
-                    .initprot = darwin.PROT.READ,
+                    .maxprot = macho.PROT.READ,
+                    .initprot = macho.PROT.READ,
                 },
             },
         });
-- 
cgit v1.2.3