Merge #1150

bors[bot] · glaubitz · web-flow · commit 6b57a5ab6087 · 2019-11-01T02:58:17.000Z
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>
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -583,6 +583,11 @@ libc_enum! {`
`583`	`583`	`}`
`584`	`584`	`}`
`585`	`585`
	`586`	`+#[cfg(not(all(target_os = "linux", target_arch = "sparc64")))]`
	`587`	`+pub const VMIN: SpecialCharacterIndices = SpecialCharacterIndices::VEOF;`
	`588`	`+#[cfg(not(all(target_os = "linux", target_arch = "sparc64")))]`
	`589`	`+pub const VTIME: SpecialCharacterIndices = SpecialCharacterIndices::VEOL;`
	`590`	`+`
`586`	`591`	`pub use libc::NCCS;`
`587`	`592`	`#[cfg(any(target_os = "dragonfly",`
`588`	`593`	`target_os = "freebsd",`