diff options
author | bors <bors@rust-lang.org> | 2022-07-29 23:59:13 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2022-07-29 23:59:13 +0000 |
commit | 4bfd852c8fa88b637133307122d9c9edf78f1caf (patch) | |
tree | 73b8d8c60b5cedb28c1815f141921d6dc91ab7eb | |
parent | d90fcbff345febc008c45f5db6063e0a63b744de (diff) | |
parent | f4f0cdbc39726e615161f86457b96c3ceaab9244 (diff) | |
download | rust-libc-4bfd852c8fa88b637133307122d9c9edf78f1caf.tar.gz |
Auto merge of #2854 - pabigot:pabigot/20220729a, r=JohnTitor
linux: add TFD_TIMER_CANCEL_ON_SET constant
This constant was added in Linux v3.0 and glibc 2.26.
-rw-r--r-- | libc-test/semver/linux.txt | 1 | ||||
-rw-r--r-- | src/unix/linux_like/linux/mod.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index ca6557eb51..cb9f387c2a 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -2452,6 +2452,7 @@ TCXONC TFD_CLOEXEC TFD_NONBLOCK TFD_TIMER_ABSTIME +TFD_TIMER_CANCEL_ON_SET THOUSEP TIMER_ABSTIME TIOCCONS diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 93082f941a..68a6911026 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -1811,6 +1811,7 @@ pub const ITIMER_PROF: ::c_int = 2; pub const TFD_CLOEXEC: ::c_int = O_CLOEXEC; pub const TFD_NONBLOCK: ::c_int = O_NONBLOCK; pub const TFD_TIMER_ABSTIME: ::c_int = 1; +pub const TFD_TIMER_CANCEL_ON_SET: ::c_int = 2; pub const _POSIX_VDISABLE: ::cc_t = 0; |