Skip to content

Commit

Permalink
Auto merge of #2582 - devnexen:pidfd_syscall_flag, r=Amanieu
Browse files Browse the repository at this point in the history
linux add pidfd_open syscall mode
  • Loading branch information
bors committed Dec 7, 2021
2 parents b76911e + d982ea6 commit e446f66
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3150,6 +3150,9 @@ fn test_linux(target: &str) {
| "UDP_SEGMENT"
if uclibc => true,

// headers conflicts with linux/pidfd.h
"PIDFD_NONBLOCK" => true,

_ => false,
}
});
Expand Down
1 change: 1 addition & 0 deletions src/unix/linux_like/linux/gnu/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e446f66

Please sign in to comment.