summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/malloc_wrapper.cc
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin/malloc_wrapper.cc')
-rw-r--r--winsup/cygwin/malloc_wrapper.cc11
1 files changed, 8 insertions, 3 deletions
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
}