Skip to content

Commit a199551

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 8632a2d commit a199551

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/override/malloc.cc

+7-8
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
@@ -161,6 +153,13 @@ extern "C"
161153
return SNMALLOC_NAME_MANGLE(malloc)(aligned_size(alignment, size));
162154
}
163155

156+
SNMALLOC_EXPORT void*
157+
SNMALLOC_NAME_MANGLE(aligned_alloc)(size_t alignment, size_t size)
158+
{
159+
assert((size % alignment) == 0);
160+
return SNMALLOC_NAME_MANGLE(memalign)(alignment, size);
161+
}
162+
164163
SNMALLOC_EXPORT int SNMALLOC_NAME_MANGLE(posix_memalign)(
165164
void** memptr, size_t alignment, size_t size)
166165
{

0 commit comments

Comments
 (0)