diff options
| author | bors <bors@rust-lang.org> | 2014-01-24 16:11:31 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-24 16:11:31 -0800 |
| commit | dc48adc69fa86039931244dc8ac0d1633c27c582 (patch) | |
| tree | 9aab9680d5dff834e97f0c7eb012294bc88a7cee /src/libnative | |
| parent | 8de3fab82a44506be96c51183d488b1019f04cc3 (diff) | |
| parent | e70ca23b8d690ac60ec31bbad8807c607e7fba05 (diff) | |
| download | rust-dc48adc69fa86039931244dc8ac0d1633c27c582.tar.gz rust-dc48adc69fa86039931244dc8ac0d1633c27c582.zip | |
auto merge of #11748 : brson/rust/timerfdandroid, r=alexcrichton
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 1ef5987de0a..c39c241daf7 100644 --- 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 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; |