Skip to content

Commit b728663

Browse files
authored
Merge pull request #1399 from asomers/accept4-android
Remove accept4 on Android arm
2 parents 7e2ae52 + a3592a4 commit b728663

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
1313
### Fixed
1414
### Removed
1515

16+
- Removed `sys::socket::accept4` from Android arm because libc removed it in
17+
version 0.2.87.
18+
([#1399](https://github.com/nix-rust/nix/pull/1399))
19+
1620
## [0.20.0] - 20 February 2021
1721
### Added
1822

src/sys/socket/mod.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,14 @@ pub fn accept(sockfd: RawFd) -> Result<RawFd> {
14811481
/// Accept a connection on a socket
14821482
///
14831483
/// [Further reading](http://man7.org/linux/man-pages/man2/accept.2.html)
1484-
#[cfg(any(target_os = "android",
1484+
#[cfg(any(all(
1485+
target_os = "android",
1486+
any(
1487+
target_arch = "aarch64",
1488+
target_arch = "x86",
1489+
target_arch = "x86_64"
1490+
)
1491+
),
14851492
target_os = "freebsd",
14861493
target_os = "linux",
14871494
target_os = "openbsd"))]

0 commit comments

Comments
 (0)