Skip to content

Commit

Permalink
Merge #1150
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bors[bot] and glaubitz committed Nov 1, 2019
2 parents 7a5248c + d99e148 commit 6b57a5a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/sys/termios.rs
Expand Up @@ -583,6 +583,11 @@ libc_enum! {
}
}

#[cfg(not(all(target_os = "linux", target_arch = "sparc64")))]
pub const VMIN: SpecialCharacterIndices = SpecialCharacterIndices::VEOF;
#[cfg(not(all(target_os = "linux", target_arch = "sparc64")))]
pub const VTIME: SpecialCharacterIndices = SpecialCharacterIndices::VEOL;

pub use libc::NCCS;
#[cfg(any(target_os = "dragonfly",
target_os = "freebsd",
Expand Down

0 comments on commit 6b57a5a

Please sign in to comment.