* cygmalloc.h (MSPACES): Define. This dropped through the cracks after the

last malloc update.
* dcrt0.cc: Fix a comment.
* malloc.cc (internal_malloc): Fix definition so that it can be safely coerced.
This commit is contained in:
Christopher Faylor 2005-07-28 17:03:34 +00:00
parent 625302ea89
commit 4fe79f1c97
4 changed files with 18 additions and 10 deletions

View File

@ -1,3 +1,11 @@
2005-07-28 Christopher Faylor <cgf@timesys.com>
* cygmalloc.h (MSPACES): Define. This dropped through the cracks after
the last malloc update.
* dcrt0.cc: Fix a comment.
* malloc.cc (internal_malloc): Fix definition so that it can be safely
coerced.
2005-07-27 Christopher Faylor <cgf@timesys.com> 2005-07-27 Christopher Faylor <cgf@timesys.com>
* include/cygwin/in.h (INET_ADDRSTRLEN): Add new definition. * include/cygwin/in.h (INET_ADDRSTRLEN): Add new definition.

View File

@ -1,6 +1,6 @@
/* cygmalloc.h: cygwin DLL malloc stuff /* cygmalloc.h: cygwin DLL malloc stuff
Copyright 2002, 2003, 2004 Red Hat, Inc. Copyright 2002, 2003, 2004, 2005 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -29,6 +29,7 @@ void dlmalloc_stats ();
# define __malloc_unlock() mallock.release () # define __malloc_unlock() mallock.release ()
extern muto mallock; extern muto mallock;
#endif #endif
#define MSPACES 1
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -958,14 +958,13 @@ dll_crt0 (per_process *uptr)
} }
/* This must be called by anyone who uses LoadLibrary to load cygwin1.dll. /* This must be called by anyone who uses LoadLibrary to load cygwin1.dll.
* You must have CYGTLS_PADSIZE bytes reserved at the bottom of the stack You must have CYGTLS_PADSIZE bytes reserved at the bottom of the stack
* calling this function, and that storage must not be overwritten until you calling this function, and that storage must not be overwritten until you
* unload cygwin1.dll, as it is used for _my_tls. It is best to load unload cygwin1.dll, as it is used for _my_tls. It is best to load
* cygwin1.dll before spawning any additional threads in your process. cygwin1.dll before spawning any additional threads in your process.
*
* See winsup/testsuite/cygload for an example of how to use cygwin1.dll See winsup/testsuite/cygload for an example of how to use cygwin1.dll
* from MSVC and non-cygwin MinGW applications. from MSVC and non-cygwin MinGW applications. */
*/
extern "C" void extern "C" void
cygwin_dll_init () cygwin_dll_init ()
{ {

View File

@ -3030,7 +3030,7 @@ static void internal_malloc_stats(mstate m) {
#else #else
#if MSPACES #if MSPACES
#define internal_malloc(m, b)\ #define internal_malloc(m, b)\
(m == gm)? dlmalloc(b) : mspace_malloc(m, b) ((m == gm)? dlmalloc(b) : mspace_malloc(m, b))
#define internal_free(m, mem)\ #define internal_free(m, mem)\
if (m == gm) dlfree(mem); else mspace_free(m,mem); if (m == gm) dlfree(mem); else mspace_free(m,mem);
#else #else