Auto merge of #1422 - newpavlov:redox_fix, r=gnzlbg

Redox target fix Closes #1420
rust-lang · Jul 6, 2019 · 3774e10 · 3774e10
2 parents 2b351c2 + 46cee95
commit 3774e10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/lib.rs b/src/lib.rs
@@ -113,7 +113,7 @@ cfg_if! {
 
         mod switch;
         pub use switch::*;
-    } else if #[cfg(unix)] {
+    } else if #[cfg(any(unix, target_os="redox"))] {
         mod fixed_width_ints;
         pub use fixed_width_ints::*;
 

diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs
@@ -36,6 +36,13 @@ pub type suseconds_t = ::c_int;
 pub type tcflag_t = u32;
 pub type time_t = ::c_long;
 
+#[cfg_attr(feature = "extra_traits", derive(Debug))]
+pub enum timezone {}
+impl ::Copy for timezone {}
+impl ::Clone for timezone {
+    fn clone(&self) -> timezone { *self }
+}
+
 s! {
     pub struct addrinfo {
         pub ai_flags: ::c_int,