diff options
| author | Jonah Petri <jonah@petri.us> | 2022-01-19 09:33:25 -0500 |
|---|---|---|
| committer | Jonah Petri <jonah@petri.us> | 2022-01-19 09:33:25 -0500 |
| commit | c4d87be1dec471c514b73a24b181f810386ba76b (patch) | |
| tree | 88ddab90aa394fbbd3543b329b920da38e1529ce | |
| parent | 3b15a77cdffc269627a6fa8ea2548651aef17d08 (diff) | |
| download | rust-libc-c4d87be1dec471c514b73a24b181f810386ba76b.tar.gz | |
uclibc: PTRACE_O_MASK comes from the kernel, not from libc, so don't specialize it for uclibc
| -rw-r--r-- | src/unix/linux_like/linux/uclibc/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/mod.rs | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/unix/linux_like/linux/uclibc/mod.rs b/src/unix/linux_like/linux/uclibc/mod.rs index b8416647be..e25a6bfb48 100644 --- a/src/unix/linux_like/linux/uclibc/mod.rs +++ b/src/unix/linux_like/linux/uclibc/mod.rs @@ -166,7 +166,6 @@ pub const PTRACE_SETREGSET: ::c_int = 0x4205; pub const PTRACE_SEIZE: ::c_int = 0x4206; pub const PTRACE_INTERRUPT: ::c_int = 0x4207; pub const PTRACE_LISTEN: ::c_int = 0x4208; -pub const PTRACE_O_MASK: ::c_int = 0x000000ff; pub const POSIX_FADV_DONTNEED: ::c_int = 4; pub const POSIX_FADV_NOREUSE: ::c_int = 5; diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs index c3bdbf9b13..bdef476aa3 100644 --- a/src/unix/linux_like/mod.rs +++ b/src/unix/linux_like/mod.rs @@ -1163,6 +1163,7 @@ pub const PTRACE_O_TRACEEXIT: ::c_int = 0x00000040; pub const PTRACE_O_TRACESECCOMP: ::c_int = 0x00000080; pub const PTRACE_O_SUSPEND_SECCOMP: ::c_int = 0x00200000; pub const PTRACE_O_EXITKILL: ::c_int = 0x00100000; +pub const PTRACE_O_MASK: ::c_int = 0x003000ff; // Wait extended result codes for the above trace options. pub const PTRACE_EVENT_FORK: ::c_int = 1; @@ -1364,12 +1365,6 @@ pub const ARPHRD_IEEE802154: u16 = 804; pub const ARPHRD_VOID: u16 = 0xFFFF; pub const ARPHRD_NONE: u16 = 0xFFFE; -cfg_if! { - if #[cfg(not(target_env = "uclibc"))] { - pub const PTRACE_O_MASK: ::c_int = 0x003000ff; - } -} - const_fn! { {const} fn CMSG_ALIGN(len: usize) -> usize { len + ::mem::size_of::<usize>() - 1 & !(::mem::size_of::<usize>() - 1) |