auto merge of #13455 : alexcrichton/rust/jettison-timerfd, r=brson

Rust advertises itself as being compatible with linux 2.6.18, but the timerfd
set of syscalls weren't added until linux 2.6.25. There is no real need for a
specialized timer implementation beyond being a "little more accurate", but the
select() implementation will suffice for now.

If it is later deemed that an accurate timerfd implementation is needed, it can
be added then through some method which will allow the standard distribution to
continue to be compatible with 2.6.18

Closes #13447

Author: bors

src/libnative/io/mod.rs

@@ -55,11 +55,8 @@ pub mod file;
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
 #[cfg(target_os = "android")]
-#[path = "timer_other.rs"]
-pub mod timer;
-
 #[cfg(target_os = "linux")]
-#[path = "timer_timerfd.rs"]
+#[path = "timer_unix.rs"]
 pub mod timer;
 
 #[cfg(target_os = "win32")]

src/libnative/io/timer_timerfd.rs

@@ -312,17 +312,20 @@ mod imp {
 
 #[cfg(target_os = "android")]
 #[cfg(target_os = "freebsd")]
+#[cfg(target_os = "linux")]
 mod imp {
     use libc;
+    use std::uint;
 
     pub static FD_SETSIZE: uint = 1024;
 
     pub struct fd_set {
-        fds_bits: [u64, ..(FD_SETSIZE / 64)]
+        fds_bits: [uint, ..(FD_SETSIZE / uint::BITS)]
     }
 
     pub fn fd_set(set: &mut fd_set, fd: i32) {
-        set.fds_bits[(fd / 64) as uint] |= (1 << (fd % 64)) as u64;
+        let fd = fd as uint;
+        set.fds_bits[fd / uint::BITS] |= 1 << (fd % uint::BITS);
     }
 
     extern {