diff options
| author | hryx <codroid@gmail.com> | 2019-06-08 16:23:27 -0700 |
|---|---|---|
| committer | hryx <codroid@gmail.com> | 2019-06-08 16:23:27 -0700 |
| commit | ad0f0562d8103d65bd36eb12ead899f375bda3e0 (patch) | |
| tree | 97adb8031a0647becf1a8b638494d8a79264c9c3 /std/c/linux.zig | |
| parent | ed5b8335b564cc4372b12e1c1a1b459aa348a90d (diff) | |
| parent | 720ed74413f086a93f5ed66159300d8dd48e8034 (diff) | |
| download | zig-ad0f0562d8103d65bd36eb12ead899f375bda3e0.tar.gz zig-ad0f0562d8103d65bd36eb12ead899f375bda3e0.zip | |
Merge branch 'master' into translate-c-userland
Diffstat (limited to 'std/c/linux.zig')
| -rw-r--r-- | std/c/linux.zig | 6 |
1 files changed, 4 insertions, 2 deletions
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; |