diff options
| author | bors <bors@rust-lang.org> | 2013-08-02 22:05:03 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-02 22:05:03 -0700 |
| commit | 2a7be1c9e4d5a50dab4f3f95c8f1d843a7d6f084 (patch) | |
| tree | b7612d4ec3135ab61b5a02f68259943e88b87936 /src/libstd/rt | |
| parent | efd6eafeb4f734ef7883afadb4e50099430c76f2 (diff) | |
| parent | 9457ebee550d8f77ffc9b895acddae8946ee631e (diff) | |
| download | rust-2a7be1c9e4d5a50dab4f3f95c8f1d843a7d6f084.tar.gz rust-2a7be1c9e4d5a50dab4f3f95c8f1d843a7d6f084.zip | |
auto merge of #8235 : pcwalton/rust/unsafe-extern-fns, r=pcwalton
r? @brson
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/local_heap.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/thread.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs index cd8e8549211..e1e7ceacc38 100644 --- a/src/libstd/rt/local_heap.rs +++ b/src/libstd/rt/local_heap.rs @@ -92,7 +92,7 @@ pub unsafe fn local_free(ptr: *libc::c_char) { extern { #[fast_ffi] - unsafe fn rust_upcall_free_noswitch(ptr: *libc::c_char); + fn rust_upcall_free_noswitch(ptr: *libc::c_char); } } _ => { diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs index ed0137d3b0f..9f6cf68245e 100644 --- a/src/libstd/rt/thread.rs +++ b/src/libstd/rt/thread.rs @@ -49,7 +49,7 @@ impl Drop for Thread { } extern { - pub unsafe fn rust_raw_thread_start(f: &(~fn())) -> *raw_thread; - pub unsafe fn rust_raw_thread_join(thread: *raw_thread); - pub unsafe fn rust_raw_thread_delete(thread: *raw_thread); + pub fn rust_raw_thread_start(f: &(~fn())) -> *raw_thread; + pub fn rust_raw_thread_join(thread: *raw_thread); + pub fn rust_raw_thread_delete(thread: *raw_thread); } |