Merge branch 'master' into translate-c-userland

4 files changed, 15 insertions, 3 deletions

diff --git a/std/c/darwin.zig b/std/c/darwin.zig
index e45a158f68..14a5baff5c 100644
--- a/std/c/darwin.zig
+++ b/std/c/darwin.zig
@@ -3,7 +3,7 @@ const assert = std.debug.assert;
 const builtin = @import("builtin");
 const macho = std.macho;
 
-use @import("../os/bits.zig");
+usingnamespace @import("../os/bits.zig");
 
 extern "c" fn __error() *c_int;
 pub extern "c" fn _NSGetExecutablePath(buf: [*]u8, bufsize: *u32) c_int;
@@ -54,3 +54,5 @@ pub extern "c" fn mach_port_deallocate(task: ipc_space_t, name: mach_port_name_t
 pub fn sigaddset(set: *sigset_t, signo: u5) void {
     set.* |= u32(1) << (signo - 1);
 }
+
+pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
diff --git a/std/c/freebsd.zig b/std/c/freebsd.zig
index 70f3aeb9ca..bcc60e65ed 100644
--- a/std/c/freebsd.zig
+++ b/std/c/freebsd.zig
@@ -1,4 +1,8 @@
+const std = @import("../std.zig");
+usingnamespace std.c;
+
 extern "c" fn __error() *c_int;
 pub const _errno = __error;
 
 pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
+pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
diff --git a/std/c/linux.zig b/std/c/linux.zig
index 9e028728c7..9689f61082 100644
--- a/std/c/linux.zig
+++ b/std/c/linux.zig
@@ -1,5 +1,5 @@
 const std = @import("../std.zig");
-use std.c;
+usingnamespace std.c;
 
 extern "c" fn __errno_location() *c_int;
 pub const _errno = __errno_location;
@@ -7,7 +7,7 @@ pub const _errno = __errno_location;
 pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) c_int;
 pub extern "c" fn sched_getaffinity(pid: c_int, size: usize, set: *cpu_set_t) c_int;
 pub extern "c" fn eventfd(initval: c_uint, flags: c_uint) c_int;
-pub extern "c" fn epoll_ctl(epfd: fd_t, op: c_uint, fd: fd_t, event: *epoll_event) c_int;
+pub extern "c" fn epoll_ctl(epfd: fd_t, op: c_uint, fd: fd_t, event: ?*epoll_event) c_int;
 pub extern "c" fn epoll_create1(flags: c_uint) c_int;
 pub extern "c" fn epoll_wait(epfd: fd_t, events: [*]epoll_event, maxevents: c_uint, timeout: c_int) c_int;
 pub extern "c" fn epoll_pwait(
@@ -25,3 +25,5 @@ pub extern "c" fn getauxval(__type: c_ulong) c_ulong;
 
 pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
 pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
+
+pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
diff --git a/std/c/netbsd.zig b/std/c/netbsd.zig
index c677e1500b..417c78db69 100644
--- a/std/c/netbsd.zig
+++ b/std/c/netbsd.zig
@@ -1,4 +1,8 @@
+const std = @import("../std.zig");
+usingnamespace std.c;
+
 extern "c" fn __errno() *c_int;
 pub const _errno = __errno;
 
 pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
+pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;