Skip to content
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

Add struct sockaddr_dl for bsdlike platforms #866

Merged
merged 11 commits into from
Dec 12, 2017
Merged

Add struct sockaddr_dl for bsdlike platforms #866

merged 11 commits into from
Dec 12, 2017

Conversation

LuoZijun
Copy link
Contributor

@LuoZijun LuoZijun commented Dec 6, 2017

@LuoZijun LuoZijun mentioned this pull request Dec 6, 2017
Merged
@alexcrichton
Copy link
Member

Thanks! Looks like the FreeBSD CI builder is failing though?

@Susurrus
Copy link
Contributor

Susurrus commented Dec 8, 2017

@LuoZijun You probably need to add the sys/net/if_dl.h header during the build script for FreeBSD builds to make sure this struct is visible (see https://github.com/freebsd/freebsd/blob/82974662ad9f9ece5f8374d2c898e83bd03aece9/sys/net/if_dl.h). You can look through libc-test/build.rs for where to do this.

@bors
Copy link
Contributor

bors commented Dec 8, 2017

☔ The latest upstream changes (presumably #867) made this pull request unmergeable. Please resolve the merge conflicts.

@LuoZijun
Copy link
Contributor Author

@Susurrus okay.

@LuoZijun
Copy link
Contributor Author

@alexcrichton ping ...

@Susurrus
Copy link
Contributor

I think the current styling is to have commas after every field in a struct.

@LuoZijun LuoZijun changed the title Add struct sockaddr_dl for macos and freebsd Add struct sockaddr_dl for bsdlike platforms Dec 12, 2017
@LuoZijun
Copy link
Contributor Author

@Susurrus okay, it's done.

@LuoZijun
Copy link
Contributor Author

@alexcrichton all green.

@LuoZijun
Copy link
Contributor Author

@alexcrichton ping ...

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Dec 12, 2017

📌 Commit 64246e0 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Dec 12, 2017

⌛ Testing commit 64246e0 with merge 385a822...

bors added a commit that referenced this pull request Dec 12, 2017
@bors
Auto merge of #866 - LuoZijun:patch-1, r=alexcrichton
385a822 
Add struct `sockaddr_dl` for bsdlike platforms

Freebsd: https://github.com/freebsd/freebsd/blob/master/sys/net/if_dl.h#L59
Macos: https://github.com/apple/darwin-xnu/blob/master/bsd/net/if_dl.h#L95
@bors
Copy link
Contributor

bors commented Dec 12, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 385a822 to master...

@bors bors merged commit 64246e0 into rust-lang:master Dec 12, 2017
@LuoZijun LuoZijun deleted the patch-1 branch December 14, 2017 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LuoZijun @alexcrichton @Susurrus @bors