diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-21 23:24:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 23:24:39 +0000 |
| commit | fde9ebc6060ba7d5f0f49bafe82f332003ea9605 (patch) | |
| tree | 09c410385c727ac6f9e9bfae71077901f5edfb6d /src/sys/socket/mod.rs | |
| parent | 7b3129a194ecbf3e5f99f30ff26ab0e6fa7f183d (diff) | |
| parent | d444f1bcf20b29d0ec69e30046c71d005a2b9d72 (diff) | |
| download | nix-fde9ebc6060ba7d5f0f49bafe82f332003ea9605.zip | |
Merge #1394
1394: illumos and Solaris support r=asomers a=jasonbking
Adds support for the illumos target as well as improvements in the existing Solaris support.
Co-authored-by: Dominik Hassler <hadfl@omnios.org>
Co-authored-by: Joshua M. Clulow <josh@sysmgr.org>
Co-authored-by: Jason King <jason.brian.king@gmail.com>
Diffstat (limited to 'src/sys/socket/mod.rs')
| -rw-r--r-- | src/sys/socket/mod.rs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs index 73f976b8..74a26834 100644 --- a/src/sys/socket/mod.rs +++ b/src/sys/socket/mod.rs @@ -19,6 +19,7 @@ pub mod sockopt; * */ +#[cfg(not(any(target_os = "illumos", target_os = "solaris")))] pub use self::addr::{ AddressFamily, SockAddr, @@ -29,6 +30,17 @@ pub use self::addr::{ Ipv6Addr, LinkAddr, }; +#[cfg(any(target_os = "illumos", target_os = "solaris"))] +pub use self::addr::{ + AddressFamily, + SockAddr, + InetAddr, + UnixAddr, + IpAddr, + Ipv4Addr, + Ipv6Addr, +}; + #[cfg(any(target_os = "android", target_os = "linux"))] pub use crate::sys::socket::addr::netlink::NetlinkAddr; #[cfg(any(target_os = "android", target_os = "linux"))] @@ -159,6 +171,7 @@ libc_bitflags!{ #[cfg(any(target_os = "android", target_os = "dragonfly", target_os = "freebsd", + target_os = "illumos", target_os = "linux", target_os = "netbsd", target_os = "openbsd"))] @@ -167,6 +180,7 @@ libc_bitflags!{ #[cfg(any(target_os = "android", target_os = "dragonfly", target_os = "freebsd", + target_os = "illumos", target_os = "linux", target_os = "netbsd", target_os = "openbsd"))] |