diff options
| author | bors <bors@rust-lang.org> | 2016-02-25 09:38:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-25 09:38:51 +0000 |
| commit | c9852e2e550306a738653a5d4d16cab43454776f (patch) | |
| tree | 544a36b22415f5c81da44d6fc5963dbed8e916af /src/libstd/sys | |
| parent | f6f050d09003a4c7895f44fed3a7c6cdce8f2949 (diff) | |
| parent | e584a492f340a73b6d9e546b9708fcb48315bfc8 (diff) | |
| download | rust-c9852e2e550306a738653a5d4d16cab43454776f.tar.gz rust-c9852e2e550306a738653a5d4d16cab43454776f.zip | |
Auto merge of #31882 - Manishearth:rollup, r=Manishearth
- Successful merges: #31362, #31793, #31800, #31809, #31818, #31827, #31831, #31835, #31837, #31846 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/net.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index 507cc0f4ea4..16c369674f0 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -21,7 +21,7 @@ use sys_common::net::{getsockopt, setsockopt}; use time::Duration; pub use sys::{cvt, cvt_r}; -pub use libc as netc; +pub extern crate libc as netc; pub type wrlen_t = size_t; |