diff options
| author | bors <bors@rust-lang.org> | 2013-07-09 15:13:40 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-09 15:13:40 -0700 |
| commit | 137d1fb210a844a76f89d7355a1aaf9f7a88af33 (patch) | |
| tree | 79aa81625da93344be55a61eb80c8d215dd4a808 /src/libstd/rt | |
| parent | e388a80c234d628c4d1fab77dc3e3f2c04cbefc5 (diff) | |
| parent | 31114acdd7da8f2826558b11adea96d1c561aabd (diff) | |
| download | rust-137d1fb210a844a76f89d7355a1aaf9f7a88af33.tar.gz rust-137d1fb210a844a76f89d7355a1aaf9f7a88af33.zip | |
auto merge of #7657 : thestinger/rust/rollup, r=thestinger
d3be8ab r=brson 05eb3cf r=thestinger c80f4e1 r=huonw 8c27af1 r=huonw 0eee0b6 r=cmr ea2756a r=thestinger
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/global_heap.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs index 54deb8924f5..ef89b8de454 100644 --- a/src/libstd/rt/global_heap.rs +++ b/src/libstd/rt/global_heap.rs @@ -76,11 +76,11 @@ pub unsafe fn exchange_malloc(td: *c_char, size: uintptr_t) -> *c_char { box as *c_char } -// FIXME #4942: Make these signatures agree with exchange_alloc's signatures +/// The allocator for unique pointers without contained managed pointers. #[cfg(not(stage0), not(test))] #[lang="exchange_malloc"] #[inline] -pub unsafe fn exchange_malloc(_align: u32, size: uintptr_t) -> *c_char { +pub unsafe fn exchange_malloc(size: uintptr_t) -> *c_char { malloc_raw(size as uint) as *c_char } |