changes from feedback

rust-lang · Oct 22, 2023 · 047d5b2 · 047d5b2
1 parent 9baba9e
commit 047d5b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/libc-test/semver/openbsd.txt b/libc-test/semver/openbsd.txt
@@ -766,6 +766,8 @@ SF_IMMUTABLE
 SF_SETTABLE
 SHM_R
 SHM_W
+SI_MAXSZ
+SI_PAD
 SIGEMT
 SIGINFO
 SIGIO

diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs
@@ -552,9 +552,9 @@ impl siginfo_t {
         #[repr(C)]
         struct siginfo_timer {
             _si_signo: ::c_int,
-            _si_errno: ::c_int,
             _si_code: ::c_int,
-            __pad1: ::c_int,
+            _si_errno: ::c_int,
+            _pad: [::c_int; SI_PAD],
             _pid: ::pid_t,
         }
         (*(self as *const siginfo_t as *const siginfo_timer))._pid
@@ -564,9 +564,9 @@ impl siginfo_t {
         #[repr(C)]
         struct siginfo_timer {
             _si_signo: ::c_int,
-            _si_errno: ::c_int,
             _si_code: ::c_int,
-            __pad1: ::c_int,
+            _si_errno: ::c_int,
+            _pad: [::c_int; SI_PAD],
             _pid: ::pid_t,
             _uid: ::uid_t,
         }
@@ -577,8 +577,9 @@ impl siginfo_t {
         #[repr(C)]
         struct siginfo_timer {
             _si_signo: ::c_int,
-            _si_errno: ::c_int,
             _si_code: ::c_int,
+            _si_errno: ::c_int,
+            _pad: [::c_int; SI_PAD],
             _pid: ::pid_t,
             _uid: ::uid_t,
             value: ::sigval,
@@ -1609,6 +1610,9 @@ pub const NTFS_MFLAG_ALLNAMES: ::c_int = 0x2;
 
 pub const TMPFS_ARGS_VERSION: ::c_int = 1;
 
+pub const SI_MAXSZ: ::size_t = 128;
+pub const SI_PAD: ::size_t = (SI_MAXSZ / ::mem::size_of::<::c_int>()) - 3;
+
 pub const MAP_STACK: ::c_int = 0x4000;
 pub const MAP_CONCEAL: ::c_int = 0x8000;