Skip to content

Commit

Permalink
native: Don't use timerfd on Android
Browse files Browse the repository at this point in the history
It doesn't seem to exist.
  • Loading branch information
brson committed Jan 23, 2014
1 parent 7ea063e commit e70ca23
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/libnative/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/libnative/io/timer_other.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ mod imp {
}
}

#[cfg(target_os = "android")]
#[cfg(target_os = "freebsd")]
mod imp {
use std::libc;
Expand Down

17 comments on commit e70ca23

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@e70ca23

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/timerfdandroid = e70ca23 into auto

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/timerfdandroid = e70ca23 merged ok, testing candidate = fe3ef9ca

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@e70ca23

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/timerfdandroid = e70ca23 into auto

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/timerfdandroid = e70ca23 merged ok, testing candidate = c1525814

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@e70ca23

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/timerfdandroid = e70ca23 into auto

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/timerfdandroid = e70ca23 merged ok, testing candidate = 5803a55b

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 24, 2014

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 25, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@e70ca23

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 25, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/timerfdandroid = e70ca23 into auto

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 25, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/timerfdandroid = e70ca23 merged ok, testing candidate = dc48adc

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 25, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on e70ca23 Jan 25, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = dc48adc

Please sign in to comment.