move declaration of interfaces between malloc and ldso to dynlink.h

this eliminates consumers of malloc_impl.h outside of the malloc
implementation.

diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index 6468f203cb69b1dbfb6c5731c4e3f7c650546c7e..f6926919ad19762ebb24a92f38fbe81d819a85e8 100644 (file)
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -23,7 +23,6 @@
 #include "pthread_impl.h"
 #include "libc.h"
 #include "dynlink.h"
 #include "pthread_impl.h"
 #include "libc.h"
 #include "dynlink.h"

-#include "malloc_impl.h"

 
 static void error(const char *, ...);
 
 
 static void error(const char *, ...);
 

diff --git a/src/internal/dynlink.h b/src/internal/dynlink.h
index 764e3a1a8fa932ab613e854998055cff3e7e0638..b739add2f3fee0cee149fc0f61b61dffc0e22f90 100644 (file)
--- a/src/internal/dynlink.h
+++ b/src/internal/dynlink.h
@@ -105,4 +105,7 @@ hidden void __dl_vseterr(const char *, va_list);
 
 hidden ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic();
 
 
 hidden ptrdiff_t __tlsdesc_static(), __tlsdesc_dynamic();
 

+hidden extern int __malloc_replaced;
+hidden void __malloc_donate(char *, char *);
+

 #endif
 #endif

diff --git a/src/internal/malloc_impl.h b/src/internal/malloc_impl.h
index 59785a7fe137bbe0736bbcfc7f541761f73ca9d7..2c61b3ffe892886db79f275b3389e0720c47bac1 100644 (file)
--- a/src/internal/malloc_impl.h
+++ b/src/internal/malloc_impl.h
@@ -2,11 +2,10 @@
 #define MALLOC_IMPL_H
 
 #include <sys/mman.h>
 #define MALLOC_IMPL_H
 
 #include <sys/mman.h>

+#include "dynlink.h"

 
 hidden void *__expand_heap(size_t *);
 
 
 hidden void *__expand_heap(size_t *);
 

-hidden void __malloc_donate(char *, char *);
-

 hidden void *__memalign(size_t, size_t);
 
 struct chunk {
 hidden void *__memalign(size_t, size_t);
 
 struct chunk {


@@ -41,6 +40,4 @@ struct bin {
 
 hidden void __bin_chunk(struct chunk *);
 
 
 hidden void __bin_chunk(struct chunk *);
 

-hidden extern int __malloc_replaced;
-

 #endif
 #endif