| author |  Alex Rønne Petersen <alex@alexrp.com> 2026-04-17 12:01:38+02:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2026-04-17 12:01:38+02:00 |
| log | dcd9ddc7cffc397057c0d8268d10d22379871521 |
| tree | 34449427f8d510389d2f9c9e370699ced0287c57 |
| parent | a8226cd536f50fd14c059812388b87bf99324d51 |
| parent | 8abb14141e987a9d469eedf98c14eb0141d0875c |
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
lib/std/c.zig-4
| ... | ... | @@ -11459,15 +11459,11 @@ pub const disown = serenity.disown; |
| 11459 | 11459 | pub const profiling_enable = serenity.profiling_enable; |
| 11460 | 11460 | pub const profiling_disable = serenity.profiling_disable; |
| 11461 | 11461 | pub const profiling_free_buffer = serenity.profiling_free_buffer; |
| 11462 | pub const futex_wait = serenity.futex_wait; | |
| 11463 | pub const futex_wake = serenity.futex_wake; | |
| 11464 | 11462 | pub const purge = serenity.purge; |
| 11465 | 11463 | pub const perf_event = serenity.perf_event; |
| 11466 | 11464 | pub const perf_register_string = serenity.perf_register_string; |
| 11467 | 11465 | pub const get_stack_bounds = serenity.get_stack_bounds; |
| 11468 | 11466 | pub const anon_create = serenity.anon_create; |
| 11469 | pub const serenity_readlink = serenity.serenity_readlink; | |
| 11470 | pub const serenity_open = serenity.serenity_open; | |
| 11471 | 11467 | pub const getkeymap = serenity.getkeymap; |
| 11472 | 11468 | pub const setkeymap = serenity.setkeymap; |
| 11473 | 11469 |
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 | 53 | pub extern "c" fn profiling_disable(pid: pid_t) c_int; |
| 54 | 54 | pub extern "c" fn profiling_free_buffer(pid: pid_t) c_int; |
| 55 | 55 | |
| 56 | pub extern "c" fn futex(userspace_address: *u32, futex_op: c_int, value: u32, timeout: *const timespec, userspace_address2: *u32, value3: u32) c_int; | |
| 57 | pub extern "c" fn futex_wait(userspace_address: *u32, value: u32, abstime: *const timespec, clockid: clockid_t, process_shared: c_int) c_int; | |
| 58 | pub extern "c" fn futex_wake(userspace_address: *u32, count: u32, process_shared: c_int) c_int; | |
| 56 | pub extern "c" fn futex(userspace_address: *u32, futex_op: c_int, value: u32, timeout: ?*const timespec, userspace_address2: ?*u32, value3: u32) c_int; | |
| 59 | 57 | |
| 60 | 58 | pub extern "c" fn purge(mode: c_int) c_int; |
| 61 | 59 | |
| ... | ... | @@ -66,9 +64,6 @@ pub extern "c" fn get_stack_bounds(user_stack_base: *usize, user_stack_size: *us |
| 66 | 64 | |
| 67 | 65 | pub extern "c" fn anon_create(size: usize, options: O) c_int; |
| 68 | 66 | |
| 69 | pub extern "c" fn serenity_readlink(path: [*]const u8, path_length: usize, buffer: [*]u8, buffer_size: usize) c_int; | |
| 70 | pub extern "c" fn serenity_open(path: [*]const u8, path_length: usize, options: c_int, ...) c_int; | |
| 71 | ||
| 72 | 67 | pub 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; |
| 73 | 68 | pub 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; |
| 74 | 69 |