diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-01-23 01:08:34 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-01-23 01:08:34 -0800 |
| commit | e70ca23b8d690ac60ec31bbad8807c607e7fba05 (patch) | |
| tree | 2aeda94c55911aec5cbff96fd12e68481f36697f /src/libnative | |
| parent | 7ea063ea0f9a28920fafbbf21064f20eb7ca02a8 (diff) | |
| download | rust-e70ca23b8d690ac60ec31bbad8807c607e7fba05.tar.gz rust-e70ca23b8d690ac60ec31bbad8807c607e7fba05.zip | |
native: Don't use timerfd on Android
It doesn't seem to exist.
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libnative/io/timer_other.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libnative/io/mod.rs b/src/libnative/io/mod.rs index f3aca7820a5..79436bb7999 100644 --- a/src/libnative/io/mod.rs +++ b/src/libnative/io/mod.rs @@ -48,11 +48,11 @@ pub mod net; #[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 index 24ffd7a4147..4a62a400c8d 100644 --- 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; |