Skip to content

Commit 6078479

Browse files
committed
Recent versions of Android support EPOLLEXCLUSIVE
Enable epoll tests on Android, because they are passing.
1 parent da49e4f commit 6078479

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](https://semver.org/).
55

6+
## [Unreleased] - ReleaseDate
7+
### Added
8+
9+
- Added `EPOLLEXCLUSIVE` on Android.
10+
(#[1567](https://github.com/nix-rust/nix/pull/1567))
11+
12+
### Changed
13+
### Fixed
14+
### Removed
15+
616
## [0.23.0] - 2021-09-28
717
### Added
818

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ targets = [
2525
]
2626

2727
[dependencies]
28-
libc = { version = "0.2.102", features = [ "extra_traits" ] }
28+
libc = { version = "0.2.104", features = [ "extra_traits" ] }
2929
bitflags = "1.3.1"
3030
cfg-if = "1.0"
3131

src/sys/epoll.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ libc_bitflags!(
1818
EPOLLERR;
1919
EPOLLHUP;
2020
EPOLLRDHUP;
21-
#[cfg(target_os = "linux")] // Added in 4.5; not in Android.
2221
EPOLLEXCLUSIVE;
2322
#[cfg(not(target_arch = "mips"))]
2423
EPOLLWAKEUP;

test/sys/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod test_ioctl;
3030
mod test_wait;
3131
mod test_uio;
3232

33-
#[cfg(target_os = "linux")]
33+
#[cfg(any(target_os = "android", target_os = "linux"))]
3434
mod test_epoll;
3535
#[cfg(target_os = "linux")]
3636
mod test_inotify;

0 commit comments

Comments
 (0)