summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2018-09-10 20:28:47 -0400
committerRich Felker <dalias@aerifal.cx>2018-09-12 14:34:32 -0400
commitb07a5d66988344616d8dc61c6930be134086e99c (patch)
treec1df504b87e559ea7a66bc5bbd0ba0dbcf345d04
parent762cf6cdb36ec4403d833c85371a4df686e0e58d (diff)
downloadmusl-b07a5d66988344616d8dc61c6930be134086e99c.tar.gz
musl-b07a5d66988344616d8dc61c6930be134086e99c.tar.bz2
musl-b07a5d66988344616d8dc61c6930be134086e99c.tar.xz
musl-b07a5d66988344616d8dc61c6930be134086e99c.zip
move __memalign declaration to malloc_impl.h
the malloc-implementation-private header is the only right place for this, because, being in the reserved namespace, __memalign is not interposable and thus not valid to use anywhere else. anything outside of the malloc implementation must call an appropriate-namespace public function (aligned_alloc or posix_memalign).
-rw-r--r--src/internal/malloc_impl.h2
-rw-r--r--src/malloc/aligned_alloc.c3
-rw-r--r--src/malloc/posix_memalign.c3
3 files changed, 4 insertions, 4 deletions
diff --git a/src/internal/malloc_impl.h b/src/internal/malloc_impl.h
index 40d16960..88b4f670 100644
--- a/src/internal/malloc_impl.h
+++ b/src/internal/malloc_impl.h
@@ -12,6 +12,8 @@ void *__expand_heap(size_t *);
void __malloc_donate(char *, char *);
+void *__memalign(size_t, size_t);
+
struct chunk {
size_t psize, csize;
struct chunk *next, *prev;
diff --git a/src/malloc/aligned_alloc.c b/src/malloc/aligned_alloc.c
index cc0a8012..b6143f30 100644
--- a/src/malloc/aligned_alloc.c
+++ b/src/malloc/aligned_alloc.c
@@ -1,6 +1,5 @@
#include <stdlib.h>
-
-void *__memalign(size_t, size_t);
+#include "malloc_impl.h"
void *aligned_alloc(size_t align, size_t len)
{
diff --git a/src/malloc/posix_memalign.c b/src/malloc/posix_memalign.c
index cf67db63..2ea8bd8a 100644
--- a/src/malloc/posix_memalign.c
+++ b/src/malloc/posix_memalign.c
@@ -1,7 +1,6 @@
#include <stdlib.h>
#include <errno.h>
-
-void *__memalign(size_t, size_t);
+#include "malloc_impl.h"
int posix_memalign(void **res, size_t align, size_t len)
{