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.

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

Add SO_DOMAIN constants to FreeBSD #2013

Merged
merged 1 commit into from Dec 29, 2020
Merged

Add SO_DOMAIN constants to FreeBSD #2013

merged 1 commit into from Dec 29, 2020

Conversation

Thomasdezeeuw
Copy link
Contributor

No description provided.

@rust-highfive
Copy link

r? @JohnTitor

(rust-highfive has picked a reviewer for you, use r? to override)

@Thomasdezeeuw
Copy link
Contributor Author

Seems SO_PROTOCOL was already defined somewhere else, I've removed it.

@Thomasdezeeuw Thomasdezeeuw changed the title Add SO_PROTOCOL and SO_DOMAIN constants to FreeBSD Add SO_DOMAIN constants to FreeBSD Dec 28, 2020
@JohnTitor
Copy link
Member

CI failed:

identifier 'SO_DOMAIN'
  cargo:warning=            static const int __test_const_SO_DOMAIN_val = SO_DOMAIN;
  cargo:warning=                                                          ^
  cargo:warning=1 error generated.
  exit code: 1

@Thomasdezeeuw
Copy link
Contributor Author

It seems it isn't available on FreeBSD 11, I'll take a look at how to define it only on 12/13.

@Thomasdezeeuw Thomasdezeeuw mentioned this pull request Dec 29, 2020
@Thomasdezeeuw
Copy link
Contributor Author

@JohnTitor fixed it, it's now only defined on FreeBSD 12/13.

@JohnTitor
Copy link
Member

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Dec 29, 2020

📌 Commit 01f7008 has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Dec 29, 2020

⌛ Testing commit 01f7008 with merge 7e7452f...

@bors
Copy link
Contributor

bors commented Dec 29, 2020

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing 7e7452f to master...

@bors bors merged commit 7e7452f into rust-lang:master Dec 29, 2020
@Thomasdezeeuw Thomasdezeeuw deleted the freebsd-constants branch January 8, 2021 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants