Skip to content

Commit

Permalink
Merge #1151
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bors[bot] and glaubitz committed Nov 2, 2019
2 parents 418ba35 + c7c1beb commit 30b04c5
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/sys/termios.rs
Expand Up @@ -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",
Expand Down

0 comments on commit 30b04c5

Please sign in to comment.