From a69af17888f040b6e9baf344fde984e7f3b60ee6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 21 Apr 2019 16:57:34 -0600 Subject: [PATCH] Support redox target os with unix target family --- Cargo.toml | 2 +- src/lib.rs | 2 +- src/sys/redox/tty.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6e88e81..81bcbce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "termion" -version = "1.5.1" +version = "1.5.2" authors = ["ticki ", "gycos ", "IGI-111 "] description = "A bindless library for manipulating terminals." repository = "https://gitlab.redox-os.org/redox-os/termion" diff --git a/src/lib.rs b/src/lib.rs index 1d8f66f..24917ad 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,7 +17,7 @@ extern crate numtoa; #[path="sys/redox/mod.rs"] mod sys; -#[cfg(unix)] +#[cfg(all(unix, not(target_os = "redox")))] #[path="sys/unix/mod.rs"] mod sys; diff --git a/src/sys/redox/tty.rs b/src/sys/redox/tty.rs index 9179b39..8e21ff8 100644 --- a/src/sys/redox/tty.rs +++ b/src/sys/redox/tty.rs @@ -5,7 +5,7 @@ use super::syscall; /// Is this stream a TTY? pub fn is_tty(stream: &T) -> bool { - if let Ok(fd) = syscall::dup(stream.as_raw_fd(), b"termios") { + if let Ok(fd) = syscall::dup(stream.as_raw_fd() as _, b"termios") { let _ = syscall::close(fd); true } else {