diff options
| author | bors <bors@rust-lang.org> | 2013-02-09 11:07:13 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-09 11:07:13 -0800 |
| commit | 19dfec2aaf746535de1521f68421f9980dbf25de (patch) | |
| tree | 76da98e9a2bd8718ac5f040ef38c84d5588767e3 | |
| parent | d90abd58799e7551682c193c0b0d1697ee618f95 (diff) | |
| parent | e2e474767e4f6edbd8f7370598d4fec8af9751bf (diff) | |
auto merge of #4852 : Caseus/rust/issue-4836, r=brson
Simple removal of rust_compare_and_swap_ptr from rt, as per Issue #4836
| -rw-r--r-- | src/rt/rust_builtin.cpp | 6 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 32f2c4ebde2..e14f62ffae9 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -776,12 +776,6 @@ rust_osmain_sched_id() { return task->kernel->osmain_sched_id(); } -extern "C" CDECL bool -rust_compare_and_swap_ptr(intptr_t *address, - intptr_t oldval, intptr_t newval) { - return sync::compare_and_swap(address, oldval, newval); -} - extern "C" void rust_task_inhibit_kill(rust_task *task) { task->inhibit_kill(); diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 9076670392a..818eb5f83a7 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -154,7 +154,6 @@ rust_dbg_call rust_dbg_do_nothing rust_dbg_breakpoint rust_osmain_sched_id -rust_compare_and_swap_ptr rust_task_inhibit_kill rust_task_allow_kill rust_task_inhibit_yield |