diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-02 23:37:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-02 23:37:58 +0000 |
| commit | 30b04c59a91d83157d5876b31c7ea6b3b2f44340 (patch) | |
| tree | 2533973d44bc72543ce4088801adabf6321b053c | |
| parent | 418ba35eb0ba1c942890a43094fbb343356257c1 (diff) | |
| parent | c7c1bebd696974ee21141008196c7aad3fd97112 (diff) | |
| download | nix-30b04c59a91d83157d5876b31c7ea6b3b2f44340.zip | |
Merge #1151
1151: sys: termios: Fix inverted logic for [cfg()] conditional for sparc64 r=asomers a=glaubitz
The fix for #1149 has the logic for the [cfg()] conditional inverted
so that the aliases for VMIN and VTIME are defined on targets that
are not linux-sparc64.
Co-authored-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
| -rw-r--r-- | src/sys/termios.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/sys/termios.rs b/src/sys/termios.rs index 80c73c9c..d08b2541 100644 --- a/src/sys/termios.rs +++ b/src/sys/termios.rs @@ -583,10 +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; +#[cfg(all(target_os = "linux", target_arch = "sparc64"))] +impl SpecialCharacterIndices { + pub const VMIN: SpecialCharacterIndices = SpecialCharacterIndices::VEOF; + pub const VTIME: SpecialCharacterIndices = SpecialCharacterIndices::VEOL; +} pub use libc::NCCS; #[cfg(any(target_os = "dragonfly", |