aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-07-05 16:24:18 -0700
committerAndrew Kelley <andrew@ziglang.org>2022-07-05 16:24:18 -0700
commit9a5c7b4b4d12a4ad90f10fafc5fa6b34d99549bb (patch)
tree6d4a7041c742bf6f92ee731e6d3b6efbb530a520 /lib
parente8ce1728e98bbdf4a13b2a2a3a87f5b2c32d26dd (diff)
parentf639cb33a9acf71e32fb69882cf59250148cfaff (diff)
downloadzig-9a5c7b4b4d12a4ad90f10fafc5fa6b34d99549bb.tar.gz
zig-9a5c7b4b4d12a4ad90f10fafc5fa6b34d99549bb.zip
Merge remote-tracking branch 'origin/master' into llvm14
Diffstat (limited to 'lib')
-rw-r--r--lib/std/os/linux.zig2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig
index 9a01b90142..ab421c4d32 100644
--- a/lib/std/os/linux.zig
+++ b/lib/std/os/linux.zig
@@ -376,7 +376,7 @@ pub fn mknodat(dirfd: i32, path: [*:0]const u8, mode: u32, dev: u32) usize {
return syscall4(.mknodat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), mode, dev);
}
-pub fn mount(special: [*:0]const u8, dir: [*:0]const u8, fstype: [*:0]const u8, flags: u32, data: usize) usize {
+pub fn mount(special: [*:0]const u8, dir: [*:0]const u8, fstype: ?[*:0]const u8, flags: u32, data: usize) usize {
return syscall5(.mount, @ptrToInt(special), @ptrToInt(dir), @ptrToInt(fstype), flags, data);
}