Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Recent versions of Android support EPOLLEXCLUSIVE #1567

Merged
merged 1 commit into from Dec 22, 2021
Merged

Recent versions of Android support EPOLLEXCLUSIVE #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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