diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-09-30 02:10:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-09-30 02:10:33 +0000 |
| commit | 3c6904fb49841a94395bcfe863eb6c8bf10a29d2 (patch) | |
| tree | 7b31b14993bfc374b769e3a1130b3f20fd2da375 /malloc/malloc.c | |
| parent | 28f532c89a76ef8ca50a8e3fbdc71894b4e97278 (diff) | |
| download | glibc-3c6904fb49841a94395bcfe863eb6c8bf10a29d2.tar.gz glibc-3c6904fb49841a94395bcfe863eb6c8bf10a29d2.tar.xz glibc-3c6904fb49841a94395bcfe863eb6c8bf10a29d2.zip | |
Update.
2003-09-27 Wolfram Gloger <wg@malloc.de> * malloc/malloc.c: Include <malloc-machine.h> earlier instead of "thread-m.h", so that default parameters can be overridden in a system-specific malloc-machine.h. Remove extra ; from extern "C" closing brace. * sysdeps/generic/malloc-machine.h: New file. * sysdeps/mach/hurd/malloc-machine.h: New file. * malloc/thread-m.h: Removed. * malloc/Makefile: Remove CFLAGS-malloc.c parameter addition, it is in sysdeps/generic/malloc-machine.h now. * elf/dl-reloc.c (_dl_allocate_static_tls): Move definition of variables only used if TLS_TCB_AT_TP is defined into the #if branch.
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 1cb374df26..c26d6676aa 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -255,6 +255,8 @@ #include <sys/types.h> #endif +#include <malloc-machine.h> + #ifdef __cplusplus extern "C" { #endif @@ -1443,11 +1445,10 @@ int __posix_memalign(void **, size_t, size_t); #endif #ifdef __cplusplus -}; /* end of extern "C" */ +} /* end of extern "C" */ #endif #include <malloc.h> -#include "thread-m.h" #ifndef BOUNDED_N #define BOUNDED_N(ptr, sz) (ptr) |