about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2013-07-08 13:27:55 -0400
committerDaniel Micay <danielmicay@gmail.com>2013-07-09 16:35:56 -0400
commita4af0960bd4bef820cdd10b014d1f9858ec9fa14 (patch)
tree0014510e3f79782b088445df50a685ee7de63534 /src/libstd/rt
parent5aa0ca9b2eb28166d9ab2e86557a5b1f84230b46 (diff)
downloadrust-a4af0960bd4bef820cdd10b014d1f9858ec9fa14.tar.gz
rust-a4af0960bd4bef820cdd10b014d1f9858ec9fa14.zip
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
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/global_heap.rs4
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
 }