Skip to content

Commit 62b227c

Browse files
bors[bot]flxo
andauthored
Merge #1481
1481: Include `sys::eventfd` for target_os = "android" r=asomers a=flxo Androids bionic [supports](https://android.googlesource.com/platform/bionic/+/d1ad4f6/libc/include/sys/eventfd.h) `eventfd`. The `libc` crate also exposes [`eventfd`](https://github.com/rust-lang/libc/blob/36a6a8e254db89cd31d178b4ba102055ceabf9a8/src/unix/linux_like/android/mod.rs#L2648) for target `android`. Extend the conditional compilation check to include the target_os "android". Fixes #1480 Co-authored-by: Felix Obenhuber <[email protected]>
2 parents 8519d9f + 8ed34b7 commit 62b227c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
2525
64-bit Android, change conditional compilation to include the field in
2626
64-bit Android builds
2727
(#[1471](https://github.com/nix-rust/nix/pull/1471))
28+
- `eventfd`s are supported on Android, change conditional compilation to
29+
include `sys::eventfd::eventfd` and `sys::eventfd::EfdFlags`for Android
30+
builds.
31+
(#[1481](https://github.com/nix-rust/nix/pull/1481))
2832

2933
### Fixed
3034

src/sys/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub mod epoll;
1717
target_os = "openbsd"))]
1818
pub mod event;
1919

20-
#[cfg(target_os = "linux")]
20+
#[cfg(any(target_os = "android", target_os = "linux"))]
2121
pub mod eventfd;
2222

2323
#[cfg(any(target_os = "android",

0 commit comments

Comments
 (0)