Skip to content

Fix _CMSG_ALIGN on DragonFly #2644

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

Merged
merged 1 commit into from
Jan 24, 2022
Merged

Conversation

rtzoeller
Copy link
Contributor

@rtzoeller rtzoeller commented Jan 24, 2022

The attempted fix in #2610 originally had 7 hard coded, but it was suggested I replace this with a size_of call. Unfortunately the suggestion omitted a subtraction from the size_of call, and I didn't catch it.

Tested by running the failing nix tests on DragonFly (and didn't change the code again after running the tests).

The last fix originally had 3 hard coded, but it was suggested I replace
this with a size_of call. Unfortunately the suggestion omitted a
subtraction from the size_of call, and I didn't catch it.
@rust-highfive
Copy link

r? @Amanieu

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

@Amanieu
Copy link
Member

Amanieu commented Jan 24, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 24, 2022

📌 Commit a894685 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Jan 24, 2022

⌛ Testing commit a894685 with merge 78e76aa...

@bors
Copy link
Contributor

bors commented Jan 24, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing 78e76aa to master...

@bors bors merged commit 78e76aa into rust-lang:master Jan 24, 2022
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.

5 participants