auto merge of #11748 : brson/rust/timerfdandroid, r=alexcrichton

It doesn't seem to exist.
rust-lang · Jan 25, 2014 · dc48adc · dc48adc
2 parents 8de3fab + e70ca23
commit dc48adc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/libnative/io/mod.rs b/src/libnative/io/mod.rs
@@ -49,11 +49,11 @@ pub mod process;
 
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
+#[cfg(target_os = "android")]
 #[path = "timer_other.rs"]
 pub mod timer;
 
 #[cfg(target_os = "linux")]
-#[cfg(target_os = "android")]
 #[path = "timer_timerfd.rs"]
 pub mod timer;
 

diff --git a/src/libnative/io/timer_other.rs b/src/libnative/io/timer_other.rs
@@ -301,6 +301,7 @@ mod imp {
     }
 }
 
+#[cfg(target_os = "android")]
 #[cfg(target_os = "freebsd")]
 mod imp {
     use std::libc;