From c7e2187a60c13d1263678e22361648bb5d663e14 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 16 Aug 2002 19:41:39 +0000 Subject: * Makefile.in: Add support for new malloc.o and renamed malloc_wrapper.o. Use -fomit-frame-pointer for malloc.o compilation. * malloc_wrapper.cc: New file. Rename from malloc.cc. Add support for more malloc functions. Eliminate export_* calls. Just use straight malloc names. Remove unused argument from malloc lock functions. * cygwin.din: Just export straight malloc names. Add malloc_stats, malloc_trim, malloc_usable_size, mallopt, memalign, valloc. * dcrt0.cc (__cygwin_user): Eliminate export_* malloc entries. * fork.cc (fork_parent): Remove unused argument from malloc_lock argument. * malloc.cc: New file. Doug Lea's malloc v2.7.1. * cygmalloc.h: New file. * include/cygwin/version.h: Bump API_MINOR. * sync.h (muto::acquire): Use appropriate number for regparm attribute. (muto::reset): Ditto. (muto::release): Ditto. --- winsup/cygwin/fork.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/fork.cc') diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index d1b7fa9a7..81ed6e21b 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -27,6 +27,8 @@ details. */ #include "perthread.h" #include "perprocess.h" #include "dll_init.h" +#include "sync.h" +#include "cygmalloc.h" #ifdef DEBUGGING static int npid; @@ -456,7 +458,7 @@ fork_parent (HANDLE& hParent, dll *&first_dll, PSECURITY_ATTRIBUTES sec_attribs = sec_user_nih (sa_buf); syscall_printf ("CreateProcess (%s, %s, 0, 0, 1, %x, 0, 0, %p, %p)", myself->progname, myself->progname, c_flags, &si, &pi); - __malloc_lock (_reent_clib ()); + __malloc_lock (); void *newheap; newheap = cygheap_setup_for_child (&ch,cygheap->fdtab.need_fixup_before ()); rc = CreateProcess (myself->progname, /* image to run */ @@ -555,7 +557,7 @@ fork_parent (HANDLE& hParent, dll *&first_dll, dll_data_start, dll_data_end, dll_bss_start, dll_bss_end, NULL); - __malloc_unlock (_reent_clib ()); + __malloc_unlock (); MALLOC_CHECK; if (!rc) goto cleanup; -- cgit v1.2.3