diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-05-16 01:26:18 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-05-16 01:26:18 -0400 |
| commit | 69a5f0d7973f2a3fefb69bc30c7dc1f0b430bba2 (patch) | |
| tree | e3e8fad5e67b66f5b51b53c421187221d1cab1e5 /lib/std/c | |
| parent | a286b5de38617809db58f918a81a650b41fbdd49 (diff) | |
| parent | f8b99331a2ca98f0e938c8caaf1cd232ad1e9fa3 (diff) | |
| download | zig-69a5f0d7973f2a3fefb69bc30c7dc1f0b430bba2.tar.gz zig-69a5f0d7973f2a3fefb69bc30c7dc1f0b430bba2.zip | |
Merge remote-tracking branch 'origin/master' into self-hosted-incremental-compilation
Diffstat (limited to 'lib/std/c')
| -rw-r--r-- | lib/std/c/dragonfly.zig | 2 | ||||
| -rw-r--r-- | lib/std/c/freebsd.zig | 2 | ||||
| -rw-r--r-- | lib/std/c/linux.zig | 2 | ||||
| -rw-r--r-- | lib/std/c/netbsd.zig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/std/c/dragonfly.zig b/lib/std/c/dragonfly.zig index a271b2e869..0c859018be 100644 --- a/lib/std/c/dragonfly.zig +++ b/lib/std/c/dragonfly.zig @@ -9,7 +9,7 @@ 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; pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize; -pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int; +pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int; pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int; pub const pthread_mutex_t = extern struct { diff --git a/lib/std/c/freebsd.zig b/lib/std/c/freebsd.zig index 3a0634dbb7..ea52c05f0b 100644 --- a/lib/std/c/freebsd.zig +++ b/lib/std/c/freebsd.zig @@ -24,7 +24,7 @@ pub extern "c" fn sendfile( flags: u32, ) c_int; -pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int; +pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int; pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int; pub const pthread_mutex_t = extern struct { diff --git a/lib/std/c/linux.zig b/lib/std/c/linux.zig index 1da0db57d6..4ceeb5a773 100644 --- a/lib/std/c/linux.zig +++ b/lib/std/c/linux.zig @@ -75,7 +75,7 @@ pub extern "c" fn inotify_add_watch(fd: fd_t, pathname: [*]const u8, mask: u32) /// See std.elf for constants for this 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 const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) 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/lib/std/c/netbsd.zig b/lib/std/c/netbsd.zig index 20960b3f77..31adbb1f59 100644 --- a/lib/std/c/netbsd.zig +++ b/lib/std/c/netbsd.zig @@ -6,7 +6,7 @@ usingnamespace std.c; extern "c" fn __errno() *c_int; pub const _errno = __errno; -pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int; +pub const dl_iterate_phdr_callback = fn (info: *dl_phdr_info, size: usize, data: ?*c_void) callconv(.C) c_int; pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int; pub extern "c" fn arc4random_buf(buf: [*]u8, len: usize) void; |