Skip to content

Commit dc48adc

Browse files
committed
auto merge of #11748 : brson/rust/timerfdandroid, r=alexcrichton
It doesn't seem to exist.
2 parents 8de3fab + e70ca23 commit dc48adc

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/libnative/io/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ pub mod process;
4949

5050
#[cfg(target_os = "macos")]
5151
#[cfg(target_os = "freebsd")]
52+
#[cfg(target_os = "android")]
5253
#[path = "timer_other.rs"]
5354
pub mod timer;
5455

5556
#[cfg(target_os = "linux")]
56-
#[cfg(target_os = "android")]
5757
#[path = "timer_timerfd.rs"]
5858
pub mod timer;
5959

src/libnative/io/timer_other.rs

+1
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ mod imp {
301301
}
302302
}
303303

304+
#[cfg(target_os = "android")]
304305
#[cfg(target_os = "freebsd")]
305306
mod imp {
306307
use std::libc;

0 commit comments

Comments
 (0)