Skip to content

Commit 516abf0

Browse files
committed
---
yaml --- r: 6200 b: refs/heads/master c: 2f8b695 h: refs/heads/master v: v3
1 parent df70b3f commit 516abf0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 0f1af17a6069160f12085841796198e67b6c710f
2+
refs/heads/master: 2f8b69534435d8dc459e5731d8fb41b22725b37f

trunk/src/lib/task.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ native "cdecl" mod rustrt {
5454
// these must run on the Rust stack so that they can swap stacks etc:
5555
fn task_sleep(time_in_us: uint);
5656
fn task_yield();
57-
fn start_task(id: task, closure: *u8);
5857
}
5958

6059
native "c-stack-cdecl" mod rustrt2 = "rustrt" {
@@ -70,6 +69,9 @@ native "c-stack-cdecl" mod rustrt2 = "rustrt" {
7069
fn get_task_pointer(id: task_id) -> *rust_task;
7170

7271
fn migrate_alloc(alloc: *u8, target: task_id);
72+
73+
fn start_task(id: task, closure: *u8);
74+
7375
}
7476

7577
/* Section: Types */
@@ -322,7 +324,7 @@ fn unsafe_spawn_inner(-thunk: fn@(),
322324

323325
// give the thunk environment's allocation to the new task
324326
rustrt2::migrate_alloc(cast(raw_thunk.env), id);
325-
rustrt::start_task(id, cast(thunkfn));
327+
rustrt2::start_task(id, cast(thunkfn));
326328
// don't cleanup the thunk in this task
327329
unsafe::leak(thunk);
328330
ret id;

0 commit comments

Comments
 (0)