Skip to content

Commit 817a1f7

Browse files
linux_like: unify SIGEV_THREAD_ID support
This effectively adds the constant for musl too, as last platform of this category. It has been supported in musl since 7c71792e ("add support for SIGEV_THREAD_ID timers") and was released with v1.2.2 in January 2021. (FWIW, emscripten also supports this.) Also double-checked that the `sigevent` struct is defined in the exact same way. Signed-off-by: Christoph Heiss <[email protected]>
1 parent 6073bdf commit 817a1f7

File tree

6 files changed

+2
-7
lines changed

6 files changed

+2
-7
lines changed

libc-test/semver/linux-gnu.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,6 @@ RWF_NOWAIT
395395
RWF_SYNC
396396
SECURITYFS_MAGIC
397397
SELINUX_MAGIC
398-
SIGEV_THREAD_ID
399398
SMACK_MAGIC
400399
SMB_SUPER_MAGIC
401400
SOL_CAIF

libc-test/semver/linux.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2830,6 +2830,7 @@ SHORT_INODE
28302830
SIGEV_NONE
28312831
SIGEV_SIGNAL
28322832
SIGEV_THREAD
2833+
SIGEV_THREAD_ID
28332834
SIGIO
28342835
SIGPOLL
28352836
SIGPWR

src/unix/linux_like/android/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2201,8 +2201,6 @@ pub const NLA_TYPE_MASK: c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER);
22012201

22022202
pub const NLA_ALIGNTO: c_int = 4;
22032203

2204-
pub const SIGEV_THREAD_ID: c_int = 4;
2205-
22062204
pub const CIBAUD: crate::tcflag_t = 0o02003600000;
22072205
pub const CBAUDEX: crate::tcflag_t = 0o010000;
22082206

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,6 @@ pub const PF_NFC: c_int = AF_NFC;
809809
pub const PF_VSOCK: c_int = AF_VSOCK;
810810
pub const PF_XDP: c_int = AF_XDP;
811811

812-
pub const SIGEV_THREAD_ID: c_int = 4;
813-
814812
pub const BUFSIZ: c_uint = 8192;
815813
pub const TMP_MAX: c_uint = 238328;
816814
pub const FOPEN_MAX: c_uint = 16;

src/unix/linux_like/linux/uclibc/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ pub const MCL_CURRENT: c_int = 0x0001;
240240
pub const MCL_FUTURE: c_int = 0x0002;
241241
pub const MCL_ONFAULT: c_int = 0x0004;
242242

243-
pub const SIGEV_THREAD_ID: c_int = 4;
244-
245243
pub const AF_VSOCK: c_int = 40;
246244

247245
// Most `*_SUPER_MAGIC` constants are defined at the `linux_like` level; the

src/unix/linux_like/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,6 +1333,7 @@ pub const CLD_CONTINUED: c_int = 6;
13331333
pub const SIGEV_SIGNAL: c_int = 0;
13341334
pub const SIGEV_NONE: c_int = 1;
13351335
pub const SIGEV_THREAD: c_int = 2;
1336+
pub const SIGEV_THREAD_ID: c_int = 4;
13361337

13371338
pub const P_ALL: idtype_t = 0;
13381339
pub const P_PID: idtype_t = 1;

0 commit comments

Comments
 (0)