From 08b0a057eb40204cd187e898b272b09eaec47391 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 4 Mar 2004 05:31:14 +0000 Subject: * gendef (sigreturn): Call stabilize_sig_stack to ensure that there are no pending signals. Restore edx later. (sigdelayed): Save edx earlier. * malloc_wrapper.cc (malloc_init): Add some more debugging output. --- winsup/cygwin/malloc_wrapper.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/malloc_wrapper.cc') diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc index 04d4f66ed..179b91b03 100644 --- a/winsup/cygwin/malloc_wrapper.cc +++ b/winsup/cygwin/malloc_wrapper.cc @@ -255,15 +255,20 @@ malloc_init () new_muto (mallock); #ifndef MALLOC_DEBUG - /* Check if mallock is provided by application. If so, redirect all + /* Check if malloc is provided by application. If so, redirect all calls to malloc/free/realloc to application provided. This may happen if some other dll calls cygwin's malloc, but main code provides its own malloc */ if (!user_data->forkee) { user_data->free (user_data->malloc (16)); - if (!export_malloc_called) - use_internal_malloc = 0; + if (export_malloc_called) + malloc_printf ("using internal malloc"); + else + { + use_internal_malloc = 0; + malloc_printf ("using external malloc"); + } } #endif } -- cgit v1.2.3