File tree 2 files changed +5
-3
lines changed
2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 0f1af17a6069160f12085841796198e67b6c710f
2
+ refs/heads/master: 2f8b69534435d8dc459e5731d8fb41b22725b37f
Original file line number Diff line number Diff line change @@ -54,7 +54,6 @@ native "cdecl" mod rustrt {
54
54
// these must run on the Rust stack so that they can swap stacks etc:
55
55
fn task_sleep ( time_in_us : uint ) ;
56
56
fn task_yield ( ) ;
57
- fn start_task ( id : task , closure : * u8 ) ;
58
57
}
59
58
60
59
native "c-stack-cdecl" mod rustrt2 = "rustrt" {
@@ -70,6 +69,9 @@ native "c-stack-cdecl" mod rustrt2 = "rustrt" {
70
69
fn get_task_pointer ( id : task_id ) -> * rust_task ;
71
70
72
71
fn migrate_alloc ( alloc : * u8 , target : task_id ) ;
72
+
73
+ fn start_task ( id : task , closure : * u8 ) ;
74
+
73
75
}
74
76
75
77
/* Section: Types */
@@ -322,7 +324,7 @@ fn unsafe_spawn_inner(-thunk: fn@(),
322
324
323
325
// give the thunk environment's allocation to the new task
324
326
rustrt2:: migrate_alloc ( cast ( raw_thunk . env) , id ) ;
325
- rustrt :: start_task ( id , cast ( thunkfn ) ) ;
327
+ rustrt2 :: start_task ( id , cast ( thunkfn ) ) ;
326
328
// don't cleanup the thunk in this task
327
329
unsafe :: leak ( thunk ) ;
328
330
ret id;
You can’t perform that action at this time.
0 commit comments