diff options
| author | Veikka Tuominen <git@vexu.eu> | 2022-11-09 17:36:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 17:36:40 +0200 |
| commit | 41b7e40d75bdd415da0daef6fa6a71dc4686320f (patch) | |
| tree | 192a10d212127c63c8c1bf8f71b7103545f0f2e3 /lib/std/os/linux.zig | |
| parent | d1e7be0bd190e1d93a6375b051a180f739990191 (diff) | |
| parent | a68b27c252669f3a42b8f789359893ee82cd0aad (diff) | |
| download | zig-41b7e40d75bdd415da0daef6fa6a71dc4686320f.tar.gz zig-41b7e40d75bdd415da0daef6fa6a71dc4686320f.zip | |
Merge pull request #13418 from ryanschneider/signal-alignment-13216
std.os: fix alignment of Sigaction.handler_fn
Diffstat (limited to 'lib/std/os/linux.zig')
| -rw-r--r-- | lib/std/os/linux.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig index e1792908ed..9d7a8fd718 100644 --- a/lib/std/os/linux.zig +++ b/lib/std/os/linux.zig @@ -3130,7 +3130,7 @@ pub const all_mask: sigset_t = [_]u32{0xffffffff} ** @typeInfo(sigset_t).Array.l pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffffffff} ** 30; const k_sigaction_funcs = struct { - const handler = ?std.meta.FnPtr(fn (c_int) callconv(.C) void); + const handler = ?std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void); const restorer = std.meta.FnPtr(fn () callconv(.C) void); }; @@ -3157,7 +3157,7 @@ pub const k_sigaction = switch (native_arch) { /// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall. pub const Sigaction = extern struct { - pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void); + pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void); pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void); handler: extern union { |