From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 11 Sep 2018 00:28:47 +0000 (-0400)
Subject: move __memalign declaration to malloc_impl.h
X-Git-Tag: v1.1.21~131
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b07a5d66988344616d8dc61c6930be134086e99c;p=oweals%2Fmusl.git

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).
---

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)
 {