diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-01 02:58:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 02:58:17 +0000 |
| commit | 6b57a5ab6087f6979aea6cc0b0e706699c70456a (patch) | |
| tree | 223e956c1180372c894ea5f41ee5fa5043d72dba | |
| parent | 7a5248c70a4ad0ef1ff1b385a7674b38403386df (diff) | |
| parent | d99e1485787f4ecd91586129031b1cec3c3cc72c (diff) | |
| download | nix-6b57a5ab6087f6979aea6cc0b0e706699c70456a.zip | |
Merge #1150
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>
| -rw-r--r-- | src/sys/termios.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/sys/termios.rs b/src/sys/termios.rs index 4dea8a93..80c73c9c 100644 --- a/src/sys/termios.rs +++ b/src/sys/termios.rs @@ -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", |