---

yaml
---
r: 22595
b: refs/heads/master
c: 93bb030
h: refs/heads/master
i:
  22593: b45c288
  22591: 0c4285a
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 03cdc2476da62ce3d55d18c649f2b479baa89794
+refs/heads/master: 93bb030a8cf2b3906c926b540a4f2833bb4da61c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/run-pass/foreign-no-abi.rs

@@ -1,7 +1,7 @@
 // ABI is cdecl by default
 
 extern mod rustrt {
-    fn get_task_id() -> int;
+    fn get_task_id() -> libc::intptr_t;
 }
 
 fn main() {

trunk/src/test/run-pass/issue-1251.rs

@@ -1,7 +1,7 @@
 #[link(name = "get_task_id")];
 
 extern mod rustrt {
-      fn get_task_id() -> int;
+      fn get_task_id() -> libc::intptr_t;
 }
 
 fn main() { }

trunk/src/test/run-pass/item-attributes.rs

@@ -163,7 +163,7 @@ mod test_foreign_items {
         #[attr];
 
         #[attr]
-        fn get_task_id() -> int;
+        fn get_task_id() -> libc::intptr_t;
     }
 }
 

trunk/src/test/run-pass/morestack6.rs

@@ -8,7 +8,7 @@ import std::rand;
 extern mod rustrt {
     fn debug_get_stk_seg() -> *u8;
 
-    fn rust_get_sched_id() -> int;
+    fn rust_get_sched_id() -> libc::intptr_t;
     fn last_os_error() -> ~str;
     fn rust_getcwd() -> ~str;
     fn get_task_id();