diff options
| author | bors <bors@rust-lang.org> | 2017-02-08 03:55:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-08 03:55:13 +0000 |
| commit | 10f6a5c4431e09d355a0ba319a630e02a1e38361 (patch) | |
| tree | 5a5240b8b3467d3a03b7bdfd407d6c9513464124 /src/libstd/sys/windows | |
| parent | c14f87e3b0823407a91a283796bf78ef83d5fe99 (diff) | |
| parent | 0a815ac816b7222554aa20b53c5fb01aa1f62616 (diff) | |
Auto merge of #39638 - frewsxcv:rollup, r=frewsxcv
Rollup of 13 pull requests - Successful merges: #38764, #39361, #39372, #39374, #39400, #39426, #39431, #39459, #39482, #39545, #39593, #39620, #39621 - Failed merges:
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 850d6f49612..e5010ca3564 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -833,13 +833,6 @@ pub struct CONSOLE_READCONSOLE_CONTROL { } pub type PCONSOLE_READCONSOLE_CONTROL = *mut CONSOLE_READCONSOLE_CONTROL; -#[link(name = "ws2_32")] -#[link(name = "userenv")] -#[link(name = "shell32")] -#[link(name = "advapi32")] -#[cfg(not(cargobuild))] -extern {} - extern "system" { pub fn WSAStartup(wVersionRequested: WORD, lpWSAData: LPWSADATA) -> c_int; |