Skip to content

Commit 3774e10

Browse files
committed
Auto merge of #1422 - newpavlov:redox_fix, r=gnzlbg
Redox target fix Closes #1420
2 parents 2b351c2 + 46cee95 commit 3774e10

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ cfg_if! {
113113

114114
mod switch;
115115
pub use switch::*;
116-
} else if #[cfg(unix)] {
116+
} else if #[cfg(any(unix, target_os="redox"))] {
117117
mod fixed_width_ints;
118118
pub use fixed_width_ints::*;
119119

src/unix/redox/mod.rs

+7
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ pub type suseconds_t = ::c_int;
3636
pub type tcflag_t = u32;
3737
pub type time_t = ::c_long;
3838

39+
#[cfg_attr(feature = "extra_traits", derive(Debug))]
40+
pub enum timezone {}
41+
impl ::Copy for timezone {}
42+
impl ::Clone for timezone {
43+
fn clone(&self) -> timezone { *self }
44+
}
45+
3946
s! {
4047
pub struct addrinfo {
4148
pub ai_flags: ::c_int,

0 commit comments

Comments
 (0)