Skip to content

Commit 5786ecc

Browse files
committed
Made aligned_alloc produce aligned values.
Previous implementation of aligned_alloc met the specification, but was not particularly useful. This uses the same implementation for alligned_alloc and memalign.
1 parent 1fd4ddd commit 5786ecc

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/override/malloc.cc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,6 @@ extern "C"
104104
}
105105
#endif
106106

107-
SNMALLOC_EXPORT void*
108-
SNMALLOC_NAME_MANGLE(aligned_alloc)(size_t alignment, size_t size)
109-
{
110-
assert((size % alignment) == 0);
111-
(void)alignment;
112-
return SNMALLOC_NAME_MANGLE(malloc)(size);
113-
}
114-
115107
inline size_t aligned_size(size_t alignment, size_t size)
116108
{
117109
// Client responsible for checking alignment is not zero
@@ -159,6 +151,13 @@ extern "C"
159151
return SNMALLOC_NAME_MANGLE(malloc)(aligned_size(alignment, size));
160152
}
161153

154+
SNMALLOC_EXPORT void*
155+
SNMALLOC_NAME_MANGLE(aligned_alloc)(size_t alignment, size_t size)
156+
{
157+
assert((size % alignment) == 0);
158+
return SNMALLOC_NAME_MANGLE(memalign)(alignment, size);
159+
}
160+
162161
SNMALLOC_EXPORT int SNMALLOC_NAME_MANGLE(posix_memalign)(
163162
void** memptr, size_t alignment, size_t size)
164163
{

0 commit comments

Comments
 (0)