diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-11-05 17:27:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 17:27:22 -0500 |
| commit | c9551652b01bf47a94c139846f22c5df85d07283 (patch) | |
| tree | 9f7c957dedad2c8e7e72c28ae065a58619c417ba /lib/std/os/bits/linux.zig | |
| parent | cf7505da1f60757d9fabda20560191bba72ebdbe (diff) | |
| parent | cca6b1113825e5d9723568a398d270ceac6da92c (diff) | |
| download | zig-c9551652b01bf47a94c139846f22c5df85d07283.tar.gz zig-c9551652b01bf47a94c139846f22c5df85d07283.zip | |
Merge pull request #6978 from LemonBoy/statshit
Decouple kernel and libc stat definitions
Diffstat (limited to 'lib/std/os/bits/linux.zig')
| -rw-r--r-- | lib/std/os/bits/linux.zig | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/std/os/bits/linux.zig b/lib/std/os/bits/linux.zig index f53f102c2a..6952ab7e0e 100644 --- a/lib/std/os/bits/linux.zig +++ b/lib/std/os/bits/linux.zig @@ -1152,11 +1152,19 @@ pub const SS_ONSTACK = 1; pub const SS_DISABLE = 2; pub const SS_AUTODISARM = 1 << 31; -pub const stack_t = extern struct { - ss_sp: [*]u8, - ss_flags: i32, - ss_size: isize, -}; +pub const stack_t = if (is_mips) + // IRIX compatible stack_t + extern struct { + ss_sp: [*]u8, + ss_size: usize, + ss_flags: i32, + } +else + extern struct { + ss_sp: [*]u8, + ss_flags: i32, + ss_size: usize, + }; pub const sigval = extern union { int: i32, @@ -1322,7 +1330,7 @@ pub const io_uring_sqe = extern struct { buf_index: u16, personality: u16, splice_fd_in: i32, - __pad2: [2]u64 + __pad2: [2]u64, }; pub const IOSQE_BIT = extern enum(u8) { @@ -1332,7 +1340,7 @@ pub const IOSQE_BIT = extern enum(u8) { IO_HARDLINK, ASYNC, BUFFER_SELECT, - + _, }; |