From a4af0960bd4bef820cdd10b014d1f9858ec9fa14 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Mon, 8 Jul 2013 13:27:55 -0400 Subject: remove the unused exchange_malloc `align` parameter `malloc` already returns memory correctly aligned for every possible type in standard C, and that's enough for all types in Rust too --- src/libstd/rt/global_heap.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstd/rt') 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 } -- cgit 1.4.1-3-g733a5