diff options
| author | bors <bors@rust-lang.org> | 2021-12-07 23:59:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-07 23:59:17 +0000 |
| commit | e446f6618e4dbe672d43d950462d40ff15632737 (patch) | |
| tree | 4d9e1551c9b55090e9e6e42099464c0162de87b0 | |
| parent | b76911ecbd94f02f750c425fd0e61ea89b4de012 (diff) | |
| parent | d982ea6eee77c173231f55fea852d9d61788c38a (diff) | |
| download | rust-libc-e446f6618e4dbe672d43d950462d40ff15632737.tar.gz | |
Auto merge of #2582 - devnexen:pidfd_syscall_flag, r=Amanieu
linux add pidfd_open syscall mode
| -rw-r--r-- | libc-test/build.rs | 3 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/gnu/mod.rs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libc-test/build.rs b/libc-test/build.rs index 38ca7d0d76..ad023fbd84 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -3150,6 +3150,9 @@ fn test_linux(target: &str) { | "UDP_SEGMENT" if uclibc => true, + // headers conflicts with linux/pidfd.h + "PIDFD_NONBLOCK" => true, + _ => false, } }); diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs index f1d4a10916..d9e273ab62 100644 --- a/src/unix/linux_like/linux/gnu/mod.rs +++ b/src/unix/linux_like/linux/gnu/mod.rs @@ -597,6 +597,7 @@ pub const RTLD_DI_TLS_MODID: ::c_int = 9; pub const RTLD_DI_TLS_DATA: ::c_int = 10; pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK; +pub const PIDFD_NONBLOCK: ::c_uint = O_NONBLOCK as ::c_uint; pub const SOL_RXRPC: ::c_int = 272; pub const SOL_PPPOL2TP: ::c_int = 273; |