Skip to content

add TCP_* consts for linux #24611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 22, 2015
Merged

add TCP_* consts for linux #24611

merged 1 commit into from
Apr 22, 2015

Conversation

dovahcrow
Copy link
Contributor

as dependency for #24594

@dovahcrow
Copy link
Contributor Author

r? @alexcrichton

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see CONTRIBUTING.md for more information.

@alexcrichton
Copy link
Member

Looks like this needs a rebase but otherwise r=me, thanks!

@dovahcrow dovahcrow force-pushed the doomsplayer-patch-1 branch from a188c3a to c11f86c Compare April 21, 2015 03:46
@dovahcrow
Copy link
Contributor Author

rebased.

On 2015年4月21日周二 上午12:09 Alex Crichton [email protected] wrote:

Looks like this needs a rebase but otherwise r=me, thanks!

—
Reply to this email directly or view it on GitHub
#24611 (comment).

@alexcrichton
Copy link
Member

Looks like there's a tidy error unfortunately :(

@dovahcrow dovahcrow force-pushed the doomsplayer-patch-1 branch from c11f86c to 7a0df61 Compare April 21, 2015 14:43
@dovahcrow
Copy link
Contributor Author

It's ok for merging now, eventually.

@alexcrichton
Copy link
Member

@bors: r+ 7a0df61

@bors
Copy link
Collaborator

bors commented Apr 21, 2015

⌛ Testing commit 7a0df61 with merge 8ce245d...

@bors
Copy link
Collaborator

bors commented Apr 21, 2015

💔 Test failed - auto-mac-32-opt

@alexcrichton
Copy link
Member

@bors: retry
On Tue, Apr 21, 2015 at 12:48 PM bors [email protected] wrote:

[image: 💔] Test failed - auto-mac-32-opt
http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4633

—
Reply to this email directly or view it on GitHub
#24611 (comment).

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Apr 21, 2015
@alexcrichton
rollup merge of rust-lang#24611: doomsplayer/doomsplayer-patch-1
6b1ce49 
as dependency for rust-lang#24594
@bors bors merged commit 7a0df61 into rust-lang:master Apr 22, 2015
steveklabnik pushed a commit to steveklabnik/rust that referenced this pull request May 7, 2015
@kevinmehall
Add TCP_* constants for mips/mipsel Linux
6c6b200 
PR rust-lang#24611 added these for other architectures, but missed
the `#[cfg(any(target_arch = "mips", target_arch = "mipsel"))]`
version of the module. The values are the same.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dovahcrow @rust-highfive @alexcrichton @bors @nikomatsakis