diff options
| author | bors <bors@rust-lang.org> | 2014-04-06 02:56:39 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-06 02:56:39 -0700 |
| commit | f1f50565a1fda0dfd60d89fea65e2328f42cc5e0 (patch) | |
| tree | c6afc2ec113c761b4a284e1370f00f29155f7025 /src/libnative/io/timer_timerfd.rs | |
| parent | 667f82a79b2275a696b21086ddf5148a617fe20a (diff) | |
| parent | 38f7a1b41b0ff9c1bcaec9a892c8ffb64ad6139f (diff) | |
| download | rust-f1f50565a1fda0dfd60d89fea65e2328f42cc5e0.tar.gz rust-f1f50565a1fda0dfd60d89fea65e2328f42cc5e0.zip | |
auto merge of #13315 : alexcrichton/rust/libc, r=alexcrichton,me
Rebasing of #12526 with a very obscure bug fixed on windows.
Diffstat (limited to 'src/libnative/io/timer_timerfd.rs')
| -rw-r--r-- | src/libnative/io/timer_timerfd.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnative/io/timer_timerfd.rs b/src/libnative/io/timer_timerfd.rs index d7202d9d765..25dbdc1e1a5 100644 --- a/src/libnative/io/timer_timerfd.rs +++ b/src/libnative/io/timer_timerfd.rs @@ -29,7 +29,7 @@ //! As with timer_other, all units in this file are in units of millseconds. use std::comm::Data; -use std::libc; +use libc; use std::ptr; use std::os; use std::rt::rtio; @@ -267,7 +267,7 @@ impl Drop for Timer { #[allow(dead_code)] mod imp { - use std::libc; + use libc; pub static CLOCK_MONOTONIC: libc::c_int = 1; pub static EPOLL_CTL_ADD: libc::c_int = 1; |