diff options
| author | bors <bors@rust-lang.org> | 2020-05-02 23:35:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-02 23:35:09 +0000 |
| commit | c1e05528696ca523055b0f7ce94b8033dcbaa39e (patch) | |
| tree | 5ef41fa793e67902ae17dfc43fb52756b5000cbf /src/libstd/sys | |
| parent | f05a5240440b3eaef1684a7965860fab40301947 (diff) | |
| parent | 97cf378f543813aeb3a87551915737a136d64aec (diff) | |
| download | rust-c1e05528696ca523055b0f7ce94b8033dcbaa39e.tar.gz rust-c1e05528696ca523055b0f7ce94b8033dcbaa39e.zip | |
Auto merge of #71807 - Dylan-DPC:rollup-jvb8sd9, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #69274 (Implement RFC 2396: `#[target_feature]` 1.1) - #71767 (doc: make Stack and StackElement a little pretty) - #71772 (Mark query function as must_use.) - #71777 (cleanup: `config::CrateType` -> `CrateType`) - #71784 (Remove recommendation for unmaintained dirs crate) - #71785 (Update comment regarding SO_REUSEADDR on Windows) - #71787 (fix rustdoc warnings) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 134f508dfab..6115d652b0c 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -216,7 +216,6 @@ pub const SOCK_STREAM: c_int = 1; pub const SOL_SOCKET: c_int = 0xffff; pub const SO_RCVTIMEO: c_int = 0x1006; pub const SO_SNDTIMEO: c_int = 0x1005; -pub const SO_REUSEADDR: c_int = 0x0004; pub const IPPROTO_IP: c_int = 0; pub const IPPROTO_TCP: c_int = 6; pub const IPPROTO_IPV6: c_int = 41; |