diff options
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/thread.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/c.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/sys/common/thread.rs b/src/libstd/sys/common/thread.rs index 048e33399a3..b725b6c7e6e 100644 --- a/src/libstd/sys/common/thread.rs +++ b/src/libstd/sys/common/thread.rs @@ -12,7 +12,7 @@ use core::prelude::*; use boxed::Box; use mem; -use uint; +use usize; use libc; use thunk::Thunk; use sys_common::stack; @@ -25,7 +25,7 @@ use sys::{thread, stack_overflow}; #[no_stack_check] pub fn start_thread(main: *mut libc::c_void) -> thread::rust_thread_return { unsafe { - stack::record_os_managed_stack_bounds(0, uint::MAX); + stack::record_os_managed_stack_bounds(0, usize::MAX); let handler = stack_overflow::Handler::new(); let f: Box<Thunk> = mem::transmute(main); f.invoke(()); diff --git a/src/libstd/sys/unix/c.rs b/src/libstd/sys/unix/c.rs index cf05733cc18..cd246e8add5 100644 --- a/src/libstd/sys/unix/c.rs +++ b/src/libstd/sys/unix/c.rs @@ -179,20 +179,20 @@ mod select { target_os = "openbsd", target_os = "linux"))] mod select { - use uint; + use usize; use libc; - pub const FD_SETSIZE: uint = 1024; + pub const FD_SETSIZE: usize = 1024; #[repr(C)] pub struct fd_set { // FIXME: shouldn't this be a c_ulong? - fds_bits: [libc::uintptr_t; (FD_SETSIZE / uint::BITS)] + fds_bits: [libc::uintptr_t; (FD_SETSIZE / usize::BITS)] } pub fn fd_set(set: &mut fd_set, fd: i32) { let fd = fd as uint; - set.fds_bits[fd / uint::BITS] |= 1 << (fd % uint::BITS); + set.fds_bits[fd / usize::BITS] |= 1 << (fd % usize::BITS); } } |
