Skip to content

Commit 4dd6665

Browse files
committed
Auto merge of #1030 - mati865:android_enoattr, r=alexcrichton
Add ENOATTR for Android PR based on #594 It's defined in Android sysroot so it should work without test workaround (CI should catch it otherwise?).
2 parents 8a9b980 + 27043ec commit 4dd6665

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

libc-test/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ fn main() {
560560

561561
// Defined by libattr not libc on linux (hard to test).
562562
// See constant definition for more details.
563-
"ENOATTR" if linux => true,
563+
"ENOATTR" if android || linux => true,
564564

565565
// On mips*-unknown-linux-gnu* CMSPAR cannot be included with the set of headers we
566566
// want to use here for testing. It's originally defined in asm/termbits.h, which is

src/unix/notbsd/android/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,6 +1458,9 @@ pub const SIOCSRARP: ::c_ulong = 0x00008962;
14581458
pub const SIOCGIFMAP: ::c_ulong = 0x00008970;
14591459
pub const SIOCSIFMAP: ::c_ulong = 0x00008971;
14601460

1461+
// Similarity to Linux it's not used but defined for compatibility.
1462+
pub const ENOATTR: ::c_int = ::ENODATA;
1463+
14611464
f! {
14621465
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
14631466
for slot in cpuset.__bits.iter_mut() {

0 commit comments

Comments
 (0)