From f8e2f358c498417f044e17a5977cc796159bba95 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 31 Aug 2003 18:26:58 +0000 Subject: * Makefile.in (MALLOC_OFILES): Always fill in with correct malloc object. * configure.in: Fill in MALLOC_OFILES with either debugging or regular malloc. * configure: Regenerate. * dlmalloc.c: Make various fruitless changes to attempt to get to work. * dlmalloc.h: Ditto. * malloc.cc (free): Check malloc pool when debugging. * path.cc (win32_device_name): Eliminate compiler warning. * sigproc.cc (sig_dispatch_pending): Remove use of was_pending. Let thisframe.call_signal_handler decide if handler should be called rather than using bogus was_pending check. * exceptions.cc (interrupt_setup): Remove accidentally checked in debugging code. * heap.cc (sbrk): Save rounded addess in user_heap_max. --- winsup/cygwin/dlmalloc.h | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'winsup/cygwin/dlmalloc.h') diff --git a/winsup/cygwin/dlmalloc.h b/winsup/cygwin/dlmalloc.h index 15b25db7b..b8d7ebeeb 100644 --- a/winsup/cygwin/dlmalloc.h +++ b/winsup/cygwin/dlmalloc.h @@ -8,7 +8,7 @@ * * bbclabel: autogenerated */ - +#define _INCLUDE_MALLOC_H_ 1 void malloc_outofmem(void (*)(void)); @@ -41,19 +41,18 @@ struct mallinfo { #ifdef MALLOC_DEBUG -#define malloc(size) malloc_dbg(size, __FILE__, __LINE__) -#define free(p) free_dbg(p, __FILE__, __LINE__) -#define realloc(p, size) realloc_dbg(p, size, __FILE__, __LINE__) -#define calloc(n, size) calloc_dbg(n, size, __FILE__, __LINE__) -#define memalign(align, size) memalign_dbg(align, size, __FILE__, __LINE__) -#define valloc(size) valloc_dbg(size, __FILE__, __LINE__) -#define pvalloc(size) pvalloc_dbg(size, __FILE__, __LINE__) -#define cfree(p) cfree_dbg(p, __FILE__, __LINE__) -#define malloc_trim(pad) malloc_trim_dbg(pad, __FILE__, __LINE__) -#define malloc_usable_size(p) malloc_usable_size_dbg(p, __FILE__, __LINE__) -#define malloc_stats() malloc_stats_dbg(__FILE__, __LINE__) -#define mallopt(flag, val) mallopt_dbg(flag, val, __FILE__, __LINE__) -#define mallinfo() mallinfo_dbg(__FILE__, __LINE__) +#define dmalloc(size) malloc_dbg(size, __FILE__, __LINE__) +#define dfree(p) free_dbg(p, __FILE__, __LINE__) +#define drealloc(p, size) realloc_dbg(p, size, __FILE__, __LINE__) +#define dcalloc(n, size) calloc_dbg(n, size, __FILE__, __LINE__) +#define dmemalign(align, size) memalign_dbg(align, size, __FILE__, __LINE__) +#define dvalloc(size) valloc_dbg(size, __FILE__, __LINE__) +#define dpvalloc(size) pvalloc_dbg(size, __FILE__, __LINE__) +#define dmalloc_trim(pad) malloc_trim_dbg(pad, __FILE__, __LINE__) +#define dmalloc_usable_size(p) malloc_usable_size_dbg(p, __FILE__, __LINE__) +#define dmalloc_stats() malloc_stats_dbg(__FILE__, __LINE__) +#define dmallopt(flag, val) mallopt_dbg(flag, val, __FILE__, __LINE__) +#define dmallinfo() mallinfo_dbg(__FILE__, __LINE__) #ifdef __cplusplus @@ -66,7 +65,6 @@ void* calloc_dbg(size_t, size_t, const char *, int); void* memalign_dbg(size_t, size_t, const char *, int); void* valloc_dbg(size_t, const char *, int); void* pvalloc_dbg(size_t, const char *, int); -void cfree_dbg(void*, const char *, int); int malloc_trim_dbg(size_t, const char *, int); size_t malloc_usable_size_dbg(void*, const char *, int); void malloc_stats_dbg(const char *, int); @@ -87,7 +85,6 @@ void* calloc(size_t, size_t); void* memalign(size_t, size_t); void* valloc(size_t); void* pvalloc(size_t); -void cfree(void*); int malloc_trim(size_t); size_t malloc_usable_size(void*); void malloc_stats(void); -- cgit v1.2.3