diff options
| author | Ryan Zoeller <rtzoeller@rtzoeller.com> | 2021-10-16 12:23:42 -0500 |
|---|---|---|
| committer | Ryan Zoeller <rtzoeller@rtzoeller.com> | 2021-12-22 12:59:35 -0600 |
| commit | e5af88425160d24a99c8a5cb40b7e6a4712bab0b (patch) | |
| tree | ba4bb5c7e1485f55df15fb7fffc4a137f7f8b184 | |
| parent | 3e952d3af7cf6a42c32c5d7415c6320db3545a6d (diff) | |
| download | nix-e5af88425160d24a99c8a5cb40b7e6a4712bab0b.zip | |
Recent versions of Android support EPOLLEXCLUSIVE
Enable epoll tests on Android, because they are passing.
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/sys/epoll.rs | 2 | ||||
| -rw-r--r-- | test/sys/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 745f6a2e..5c4c3eb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Added fine-grained features flags. Most Nix functionality can now be conditionally enabled. By default, all features are enabled. (#[1611](https://github.com/nix-rust/nix/pull/1611)) +- Added `EPOLLEXCLUSIVE` on Android. + (#[1567](https://github.com/nix-rust/nix/pull/1567)) ### Changed ### Fixed diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index 678c27f9..8141ff5c 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -18,8 +18,6 @@ libc_bitflags!( EPOLLERR; EPOLLHUP; EPOLLRDHUP; - #[cfg(target_os = "linux")] // Added in 4.5; not in Android. - #[cfg_attr(docsrs, doc(cfg(all())))] EPOLLEXCLUSIVE; #[cfg(not(target_arch = "mips"))] EPOLLWAKEUP; diff --git a/test/sys/mod.rs b/test/sys/mod.rs index e73d9b1d..60904bd1 100644 --- a/test/sys/mod.rs +++ b/test/sys/mod.rs @@ -30,7 +30,7 @@ mod test_ioctl; mod test_wait; mod test_uio; -#[cfg(target_os = "linux")] +#[cfg(any(target_os = "android", target_os = "linux"))] mod test_epoll; #[cfg(target_os = "linux")] mod test_inotify; |