aboutsummaryrefslogtreecommitdiff
path: root/lib/std/c
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-03-07 12:18:41 -0500
committerAndrew Kelley <andrew@ziglang.org>2020-03-07 12:18:41 -0500
commit96c07674fc2293fa040212ab797c05436dc515b1 (patch)
tree67b0bc649f4b4c384259a031269254a90078c0bd /lib/std/c
parentbc75c0de6c8227d1c01b59c0d63f4d012e05496f (diff)
parentabe7305e169be2047d65f96e6525d3828684f058 (diff)
downloadzig-96c07674fc2293fa040212ab797c05436dc515b1.tar.gz
zig-96c07674fc2293fa040212ab797c05436dc515b1.zip
Merge remote-tracking branch 'origin/master' into llvm10
Diffstat (limited to 'lib/std/c')
-rw-r--r--lib/std/c/darwin.zig2
-rw-r--r--lib/std/c/freebsd.zig4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/c/darwin.zig b/lib/std/c/darwin.zig
index 881e52c72c..2134e0e7a4 100644
--- a/lib/std/c/darwin.zig
+++ b/lib/std/c/darwin.zig
@@ -63,8 +63,8 @@ pub const sf_hdtr = extern struct {
};
pub extern "c" fn sendfile(
- out_fd: fd_t,
in_fd: fd_t,
+ out_fd: fd_t,
offset: off_t,
len: *off_t,
sf_hdtr: ?*sf_hdtr,
diff --git a/lib/std/c/freebsd.zig b/lib/std/c/freebsd.zig
index 2c4820bbe9..3a0634dbb7 100644
--- a/lib/std/c/freebsd.zig
+++ b/lib/std/c/freebsd.zig
@@ -15,9 +15,9 @@ pub const sf_hdtr = extern struct {
trl_cnt: c_int,
};
pub extern "c" fn sendfile(
- out_fd: fd_t,
in_fd: fd_t,
- offset: ?*off_t,
+ out_fd: fd_t,
+ offset: off_t,
nbytes: usize,
sf_hdtr: ?*sf_hdtr,
sbytes: ?*off_t,