diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f7268546f..8c953e85c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2013-01-20 Christopher Faylor + + * malloc_wrapper.cc (malloc_init): Re-add inadvertently dropped comment + which explains what's going on with the use_internal calculation. + 2013-01-20 Christopher Faylor Throughout, update copyrights to reflect dates which correspond to diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc index bbf629829..46493b775 100644 --- a/winsup/cygwin/malloc_wrapper.cc +++ b/winsup/cygwin/malloc_wrapper.cc @@ -284,6 +284,9 @@ malloc_init () if (!internal_malloc_determined) { extern void *_sigfe_malloc; + /* Decide if we are using our own version of malloc by testing the import + address from user_data. This will likely need to be updated + for 64-bit. */ use_internal = import_address (user_data->malloc) == &_sigfe_malloc; malloc_printf ("using %s malloc", use_internal ? "internal" : "external"); internal_malloc_determined = true;