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

sys: termios: Define VMIN and VTIME as VEOF and VEOL on sparc64 #1150

Merged
merged 1 commit into from
Nov 1, 2019
Merged

sys: termios: Define VMIN and VTIME as VEOF and VEOL on sparc64 #1150

merged 1 commit into from
Nov 1, 2019

Conversation

glaubitz
Copy link
Contributor

@glaubitz glaubitz commented Nov 1, 2019

On sparc64, glibc defines VMIN as VEOF and VTIME as VEOL for
termios, so we need to inherit these alias definitions for
nix-rust as well.

Fixes #1149

@glaubitz
sys: termios: Define VMIN and VTIME as VEOF and VEOL on sparc64
d99e148 
On sparc64, glibc defines VMIN as VEOF and VTIME as VEOL for
termios, so we need to inherit these alias definitions for
nix-rust as well.

Fixes nix-rust#1149
asomers
asomers approved these changes Nov 1, 2019
View reviewed changes
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this. Normally I would ask for a CHANGELOG entry. But this is such a tiny fix for such an obscure platform that I think I'm going to merge without.

bors r+

bors bot added a commit that referenced this pull request Nov 1, 2019
@bors @glaubitz
Merge #1150
6b57a5a 
1150: sys: termios: Define VMIN and VTIME as VEOF and VEOL on sparc64 r=asomers a=glaubitz

On sparc64, glibc defines VMIN as VEOF and VTIME as VEOL for
termios, so we need to inherit these alias definitions for
nix-rust as well.

Fixes #1149

Co-authored-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
@bors
Copy link
Contributor

bors bot commented Nov 1, 2019

Build succeeded

@bors bors bot merged commit d99e148 into nix-rust:master Nov 1, 2019
jrtc27
jrtc27 reviewed Nov 1, 2019
View reviewed changes
Copy link

@jrtc27 jrtc27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition is wrong; it shouldn’t have the not (ie be the inverse of the condition in the enum).

@glaubitz
Copy link
Contributor Author

glaubitz commented Nov 1, 2019

Yikes, you're right. I shouldn't be doing such things in the middle of the night.

@glaubitz
Copy link
Contributor Author

glaubitz commented Nov 1, 2019

Okay, just opened another PR #1151 to fix this. Sorry for that.

@glaubitz
Copy link
Contributor Author

glaubitz commented Nov 1, 2019

Also, I think the definitions need to be moved into libc_enum but I haven't verified that yet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrtc27 jrtc27 jrtc27 left review comments

@asomers asomers asomers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

VMIN and VTIME should be defined on sparc64
3 participants
@glaubitz @asomers @jrtc27