diff options
| author | bors <bors@rust-lang.org> | 2016-10-06 11:42:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-06 11:42:34 -0700 |
| commit | ad19c32a58a1c5502e2f63350f72a2479c219498 (patch) | |
| tree | f223fa1b72d4685258f681b218c09154d7d22155 /src/libstd/sys | |
| parent | 46957f05771a427545c792f69b37f8e05dcbb15d (diff) | |
| parent | 89aebdbce8c92617be0cebbd86a14289f2419b79 (diff) | |
| download | rust-ad19c32a58a1c5502e2f63350f72a2479c219498.tar.gz rust-ad19c32a58a1c5502e2f63350f72a2479c219498.zip | |
Auto merge of #37002 - jonathandturner:rollup, r=jonathandturner
Rollup of 15 pull requests - Successful merges: #36726, #36832, #36909, #36930, #36932, #36957, #36959, #36960, #36962, #36965, #36966, #36967, #36972, #36974, #36977 - Failed merges:
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", |