authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-04-17 12:01:38+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-04-17 12:01:38+02:00
logdcd9ddc7cffc397057c0d8268d10d22379871521
tree34449427f8d510389d2f9c9e370699ced0287c57
parenta8226cd536f50fd14c059812388b87bf99324d51
parent8abb14141e987a9d469eedf98c14eb0141d0875c

Merge pull request 'std.c: Two small fixes for serenity' (#31916) from linus/zig:serenity-fixes into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/31916 Reviewed-by: Alex Rønne Petersen <alex@alexrp.com>

2 files changed, 1 insertions(+), 10 deletions(-)

lib/std/c.zig-4
...@@ -11459,15 +11459,11 @@ pub const disown = serenity.disown;...@@ -11459,15 +11459,11 @@ pub const disown = serenity.disown;
11459pub const profiling_enable = serenity.profiling_enable;11459pub const profiling_enable = serenity.profiling_enable;
11460pub const profiling_disable = serenity.profiling_disable;11460pub const profiling_disable = serenity.profiling_disable;
11461pub const profiling_free_buffer = serenity.profiling_free_buffer;11461pub const profiling_free_buffer = serenity.profiling_free_buffer;
11462pub const futex_wait = serenity.futex_wait;
11463pub const futex_wake = serenity.futex_wake;
11464pub const purge = serenity.purge;11462pub const purge = serenity.purge;
11465pub const perf_event = serenity.perf_event;11463pub const perf_event = serenity.perf_event;
11466pub const perf_register_string = serenity.perf_register_string;11464pub const perf_register_string = serenity.perf_register_string;
11467pub const get_stack_bounds = serenity.get_stack_bounds;11465pub const get_stack_bounds = serenity.get_stack_bounds;
11468pub const anon_create = serenity.anon_create;11466pub const anon_create = serenity.anon_create;
11469pub const serenity_readlink = serenity.serenity_readlink;
11470pub const serenity_open = serenity.serenity_open;
11471pub const getkeymap = serenity.getkeymap;11467pub const getkeymap = serenity.getkeymap;
11472pub const setkeymap = serenity.setkeymap;11468pub const setkeymap = serenity.setkeymap;
1147311469
lib/std/c/serenity.zig+1-6
...@@ -53,9 +53,7 @@ pub extern "c" fn profiling_enable(pid: pid_t, event_mask: PERF_EVENT) c_int;...@@ -53,9 +53,7 @@ pub extern "c" fn profiling_enable(pid: pid_t, event_mask: PERF_EVENT) c_int;
53pub extern "c" fn profiling_disable(pid: pid_t) c_int;53pub extern "c" fn profiling_disable(pid: pid_t) c_int;
54pub extern "c" fn profiling_free_buffer(pid: pid_t) c_int;54pub extern "c" fn profiling_free_buffer(pid: pid_t) c_int;
5555
56pub extern "c" fn futex(userspace_address: *u32, futex_op: c_int, value: u32, timeout: *const timespec, userspace_address2: *u32, value3: u32) c_int;56pub extern "c" fn futex(userspace_address: *u32, futex_op: c_int, value: u32, timeout: ?*const timespec, userspace_address2: ?*u32, value3: u32) c_int;
57pub extern "c" fn futex_wait(userspace_address: *u32, value: u32, abstime: *const timespec, clockid: clockid_t, process_shared: c_int) c_int;
58pub extern "c" fn futex_wake(userspace_address: *u32, count: u32, process_shared: c_int) c_int;
5957
60pub extern "c" fn purge(mode: c_int) c_int;58pub extern "c" fn purge(mode: c_int) c_int;
6159
...@@ -66,9 +64,6 @@ pub extern "c" fn get_stack_bounds(user_stack_base: *usize, user_stack_size: *us...@@ -66,9 +64,6 @@ pub extern "c" fn get_stack_bounds(user_stack_base: *usize, user_stack_size: *us
6664
67pub extern "c" fn anon_create(size: usize, options: O) c_int;65pub extern "c" fn anon_create(size: usize, options: O) c_int;
6866
69pub extern "c" fn serenity_readlink(path: [*]const u8, path_length: usize, buffer: [*]u8, buffer_size: usize) c_int;
70pub extern "c" fn serenity_open(path: [*]const u8, path_length: usize, options: c_int, ...) c_int;
71
72pub extern "c" fn getkeymap(name_buffer: [*]u8, name_buffer_size: usize, map: [*]u32, shift_map: [*]u32, alt_map: [*]u32, altgr_map: [*]u32, shift_altgr_map: [*]u32) c_int;67pub extern "c" fn getkeymap(name_buffer: [*]u8, name_buffer_size: usize, map: [*]u32, shift_map: [*]u32, alt_map: [*]u32, altgr_map: [*]u32, shift_altgr_map: [*]u32) c_int;
73pub extern "c" fn setkeymap(name: [*]const u8, map: [*]const u32, shift_map: [*]const u32, alt_map: [*]const u32, altgr_map: [*]const u32, shift_altgr_map: [*]const u32) c_int;68pub extern "c" fn setkeymap(name: [*]const u8, map: [*]const u32, shift_map: [*]const u32, alt_map: [*]const u32, altgr_map: [*]const u32, shift_altgr_map: [*]const u32) c_int;
7469