Use ctypes in native function declarations

5 files changed, 10 insertions, 10 deletions

diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
index 353c14fe5a8..98d49083f9d 100644
--- a/src/libcore/comm.rs
+++ b/src/libcore/comm.rs
@@ -33,7 +33,7 @@ native mod rustrt {
                             target_task: task::task, target_port: port_id,
                             data: T) -> ctypes::uintptr_t;
 
-    fn new_port(unit_sz: uint) -> *rust_port;
+    fn new_port(unit_sz: ctypes::size_t) -> *rust_port;
     fn del_port(po: *rust_port);
     fn rust_port_detach(po: *rust_port);
     fn get_port_id(po: *rust_port) -> port_id;
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 8ce0730df4f..a7eb33daeaf 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -6,7 +6,7 @@ Unsafe pointer utility functions
 #[abi = "rust-intrinsic"]
 native mod rusti {
     fn addr_of<T>(val: T) -> *T;
-    fn ptr_offset<T>(ptr: *T, count: uint) -> *T;
+    fn ptr_offset<T>(ptr: *T, count: ctypes::uintptr_t) -> *T;
 }
 
 /*
diff --git a/src/libcore/sys.rs b/src/libcore/sys.rs
index 7360ca3521a..2d516fbeea3 100644
--- a/src/libcore/sys.rs
+++ b/src/libcore/sys.rs
@@ -16,12 +16,12 @@ native mod rustrt {
     // available outside this crate. Otherwise it's
     // visible-in-crate, but not re-exported.
     fn last_os_error() -> str;
-    fn refcount<T>(t: @T) -> uint;
+    fn refcount<T>(t: @T) -> ctypes::intptr_t;
     fn do_gc();
     fn unsupervise();
     fn shape_log_str<T>(t: *sys::type_desc, data: T) -> str;
-    fn rust_set_exit_status(code: int);
-    fn set_min_stack(size: uint);
+    fn rust_set_exit_status(code: ctypes::intptr_t);
+    fn set_min_stack(size: ctypes::uintptr_t);
 }
 
 #[abi = "rust-intrinsic"]
@@ -103,7 +103,7 @@ fn log_str<T>(t: T) -> str {
             with the default failure status."
 )]
 fn set_exit_status(code: int) {
-    rustrt::rust_set_exit_status(code);
+    rustrt::rust_set_exit_status(code as ctypes::intptr_t);
 }
 
 // FIXME: #1495 - This shouldn't exist
diff --git a/src/libcore/task.rs b/src/libcore/task.rs
index 6f3e7b0f065..cd6fb1a4ae1 100644
--- a/src/libcore/task.rs
+++ b/src/libcore/task.rs
@@ -55,7 +55,7 @@ export try;
 #[abi = "rust-intrinsic"]
 native mod rusti {
     // these must run on the Rust stack so that they can swap stacks etc:
-    fn task_sleep(task: *rust_task, time_in_us: uint, &killed: bool);
+    fn task_sleep(task: *rust_task, time_in_us: c::size_t, &killed: bool);
 }
 
 type rust_closure = {
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index c4ddde19e94..33ff630e708 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -8,17 +8,17 @@ import ptr::addr_of;
 
 #[abi = "rust-intrinsic"]
 native mod rusti {
-    fn vec_len<T>(&&v: [const T]) -> uint;
+    fn vec_len<T>(&&v: [const T]) -> ctypes::size_t;
 }
 
 #[abi = "cdecl"]
 native mod rustrt {
     fn vec_reserve_shared<T>(t: *sys::type_desc,
                              &v: [const T],
-                             n: uint);
+                             n: ctypes::size_t);
     fn vec_from_buf_shared<T>(t: *sys::type_desc,
                               ptr: *T,
-                              count: uint) -> [T];
+                              count: ctypes::size_t) -> [T];
 }
 
 /*