about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-02 16:36:50 -0700
committerbors <bors@rust-lang.org>2014-04-02 16:36:50 -0700
commitf503f6c0b90e69425952ddc3ee3c6022be769ace (patch)
tree07ce928ee77fea3d2b0a1d0bbfe021038bd0d708 /src/libnative
parent3786b552a6ffd2219d8e42df6f8db6cc386cce56 (diff)
parent9a259f4303cd6550a38ccd12b07ae14c1e21a263 (diff)
downloadrust-f503f6c0b90e69425952ddc3ee3c6022be769ace.tar.gz
rust-f503f6c0b90e69425952ddc3ee3c6022be769ace.zip
auto merge of #13257 : alexcrichton/rust/index-uint, r=pnkfelix
The details are outlined in the first commit. 

Closes #10453
Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/io/timer_other.rs4
-rw-r--r--src/libnative/io/timer_win32.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libnative/io/timer_other.rs b/src/libnative/io/timer_other.rs
index ea237944bad..7979075aa02 100644
--- a/src/libnative/io/timer_other.rs
+++ b/src/libnative/io/timer_other.rs
@@ -296,7 +296,7 @@ mod imp {
     }
 
     pub fn fd_set(set: &mut fd_set, fd: i32) {
-        set.fds_bits[fd / 32] |= 1 << (fd % 32);
+        set.fds_bits[(fd / 32) as uint] |= 1 << (fd % 32);
     }
 
     extern {
@@ -323,7 +323,7 @@ mod imp {
     }
 
     pub fn fd_set(set: &mut fd_set, fd: i32) {
-        set.fds_bits[fd / 64] |= (1 << (fd % 64)) as u64;
+        set.fds_bits[(fd / 64) as uint] |= (1 << (fd % 64)) as u64;
     }
 
     extern {
diff --git a/src/libnative/io/timer_win32.rs b/src/libnative/io/timer_win32.rs
index a342afa6854..3e420e45448 100644
--- a/src/libnative/io/timer_win32.rs
+++ b/src/libnative/io/timer_win32.rs
@@ -78,7 +78,7 @@ fn helper(input: libc::HANDLE, messages: Receiver<Req>) {
             }
         } else {
             let remove = {
-                match &chans[idx - 1] {
+                match &chans[idx as uint - 1] {
                     &(ref c, oneshot) => !c.try_send(()) || oneshot
                 }
             };