diff options
| author | Jonathan Turner <jonathandturner@users.noreply.github.com> | 2016-10-06 08:35:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-06 08:35:43 -0700 |
| commit | 06989295639d5fd6f08977271339702f48c75e23 (patch) | |
| tree | b958e04d99c9f32d5ba3b2e3d57365e8b926ba60 /src/libstd/sys | |
| parent | ed5a3c01a03da160b179166d2c1c839afac0b857 (diff) | |
| parent | 4922abfbd26c74a4bfb2d8ab5077eda7938be457 (diff) | |
| download | rust-06989295639d5fd6f08977271339702f48c75e23.tar.gz rust-06989295639d5fd6f08977271339702f48c75e23.zip | |
Rollup merge of #36965 - kallisti5:master, r=alexcrichton
Haiku: Fix IPv6 target_os check
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/net.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index 2599bb660e8..74a46fce403 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -29,7 +29,7 @@ use sys::net::netc::IPV6_JOIN_GROUP as IPV6_ADD_MEMBERSHIP; #[cfg(not(any(target_os = "dragonfly", target_os = "freebsd", target_os = "ios", target_os = "macos", target_os = "openbsd", target_os = "netbsd", - target_os = "solaris", taget_os = "haiku")))] + target_os = "solaris", target_os = "haiku")))] use sys::net::netc::IPV6_ADD_MEMBERSHIP; #[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "ios", target_os = "macos", |