Browse Source

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

this eliminates consumers of malloc_impl.h outside of the malloc
implementation.
master
Rich Felker 6 years ago
parent
commit
cee88b76f7
  1. 1
      ldso/dynlink.c
  2. 3
      src/internal/dynlink.h
  3. 5
      src/internal/malloc_impl.h

1
ldso/dynlink.c

@ -23,7 +23,6 @@
#include "pthread_impl.h" #include "pthread_impl.h"
#include "libc.h" #include "libc.h"
#include "dynlink.h" #include "dynlink.h"
#include "malloc_impl.h"
static void error(const char *, ...); static void error(const char *, ...);

3
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

5
src/internal/malloc_impl.h

@ -2,11 +2,10 @@
#define MALLOC_IMPL_H #define MALLOC_IMPL_H
#include <sys/mman.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); hidden void *__memalign(size_t, size_t);
struct chunk { 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

Loading…
Cancel
Save