Skip to content

Commit 06290dd

Browse files
committed
---
yaml --- r: 20487 b: refs/heads/snap-stage3 c: 93bb030 h: refs/heads/master i: 20485: 67a1b95 20483: b4b7d87 20479: 9ebca6f v: v3
1 parent c5168f3 commit 06290dd

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 03cdc2476da62ce3d55d18c649f2b479baa89794
4+
refs/heads/snap-stage3: 93bb030a8cf2b3906c926b540a4f2833bb4da61c
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-pass/foreign-no-abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ABI is cdecl by default
22

33
extern mod rustrt {
4-
fn get_task_id() -> int;
4+
fn get_task_id() -> libc::intptr_t;
55
}
66

77
fn main() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[link(name = "get_task_id")];
22

33
extern mod rustrt {
4-
fn get_task_id() -> int;
4+
fn get_task_id() -> libc::intptr_t;
55
}
66

77
fn main() { }

branches/snap-stage3/src/test/run-pass/item-attributes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ mod test_foreign_items {
163163
#[attr];
164164

165165
#[attr]
166-
fn get_task_id() -> int;
166+
fn get_task_id() -> libc::intptr_t;
167167
}
168168
}
169169

branches/snap-stage3/src/test/run-pass/morestack6.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import std::rand;
88
extern mod rustrt {
99
fn debug_get_stk_seg() -> *u8;
1010

11-
fn rust_get_sched_id() -> int;
11+
fn rust_get_sched_id() -> libc::intptr_t;
1212
fn last_os_error() -> ~str;
1313
fn rust_getcwd() -> ~str;
1414
fn get_task_id();

0 commit comments

Comments
 (0)