diff options
author | Paul Osborne <osbpau@gmail.com> | 2019-06-03 16:21:38 -0500 |
---|---|---|
committer | Paul Osborne <osbpau@gmail.com> | 2019-06-07 09:52:35 -0500 |
commit | 80b85fbfe9ef8728cf3da5507d7374e1231ea9a1 (patch) | |
tree | 646cd326a5106b5ad5f5793003036a736029f31f | |
parent | 5a2586b38e7312e90dfca4cb390b8b908175c70e (diff) | |
download | nix-80b85fbfe9ef8728cf3da5507d7374e1231ea9a1.zip |
ifaddrs: add ifaddrs support for android
Support under bionic/android is the same as under Linux for what is exposed
by this code.
Signed-off-by: Paul Osborne <osbpau@gmail.com>
-rw-r--r-- | CHANGELOG.md | 3 | ||||
-rw-r--r-- | src/ifaddrs.rs | 2 | ||||
-rw-r--r-- | src/lib.rs | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f23d39a..3420681b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ([#1079](https://github.com/nix-rust/nix/pull/1079)) ### Changed +- Support for `ifaddrs` now present when building for Android. + ([#1077](https://github.com/nix-rust/nix/pull/1077)) + ### Fixed ### Removed diff --git a/src/ifaddrs.rs b/src/ifaddrs.rs index 61d36ff4..c9790773 100644 --- a/src/ifaddrs.rs +++ b/src/ifaddrs.rs @@ -32,7 +32,7 @@ pub struct InterfaceAddress { } cfg_if! { - if #[cfg(any(target_os = "emscripten", target_os = "fuchsia", target_os = "linux"))] { + if #[cfg(any(target_os = "android", target_os = "emscripten", target_os = "fuchsia", target_os = "linux"))] { fn get_ifu_from_sockaddr(info: &libc::ifaddrs) -> *const libc::sockaddr { info.ifa_ifu } @@ -35,7 +35,8 @@ pub mod errno; pub mod features; pub mod fcntl; #[deny(missing_docs)] -#[cfg(any(target_os = "dragonfly", +#[cfg(any(target_os = "android", + target_os = "dragonfly", target_os = "freebsd", target_os = "ios", target_os = "linux", |