From 3c6904fb49841a94395bcfe863eb6c8bf10a29d2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 30 Sep 2003 02:10:33 +0000 Subject: Update. 2003-09-27 Wolfram Gloger * malloc/malloc.c: Include 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. --- malloc/malloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'malloc/malloc.c') 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 #endif +#include + #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 -#include "thread-m.h" #ifndef BOUNDED_N #define BOUNDED_N(ptr, sz) (ptr) -- cgit v1.2.3