Skip to content

Commit

Permalink
Merge #1567
Browse files Browse the repository at this point in the history
1567: Recent versions of Android support EPOLLEXCLUSIVE r=rtzoeller a=rtzoeller

[Corresponding libc change](rust-lang/libc@36be4cd).

Enable the epoll tests on Android, because they are passing.

Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
  • Loading branch information
bors[bot] and rtzoeller committed Dec 22, 2021
2 parents 3e952d3 + e5af884 commit 78f2301
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/sys/epoll.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/sys/mod.rs
Expand Up @@ -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;
Expand Down

0 comments on commit 78f2301

Please sign in to comment.