* 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.

4 files changed, 18 insertions, 10 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7d7ff6349..03e41da5b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -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>
 
 	* include/cygwin/in.h (INET_ADDRSTRLEN): Add new definition.
diff --git a/winsup/cygwin/cygmalloc.h b/winsup/cygwin/cygmalloc.h
index 10508296d..7d10b3e12 100644
--- a/winsup/cygwin/cygmalloc.h
+++ b/winsup/cygwin/cygmalloc.h
@@ -1,6 +1,6 @@
 /* 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.
 
@@ -29,6 +29,7 @@ void dlmalloc_stats ();
 # define __malloc_unlock() mallock.release ()
 extern muto mallock;
 #endif
+#define MSPACES 1
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index d15fca436..9fd9fa8ba 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -958,14 +958,13 @@ dll_crt0 (per_process *uptr)
 }
 
 /* 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
- * 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
- * cygwin1.dll before spawning any additional threads in your process.
- *
- * See winsup/testsuite/cygload for an example of how to use cygwin1.dll
- * from MSVC and non-cygwin MinGW applications.
- */
+   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
+   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.
+  
+   See winsup/testsuite/cygload for an example of how to use cygwin1.dll
+   from MSVC and non-cygwin MinGW applications.  */
 extern "C" void
 cygwin_dll_init ()
 {
diff --git a/winsup/cygwin/malloc.cc b/winsup/cygwin/malloc.cc
index 4dd1cf926..de97bce76 100644
--- a/winsup/cygwin/malloc.cc
+++ b/winsup/cygwin/malloc.cc
@@ -3030,7 +3030,7 @@ static void internal_malloc_stats(mstate m) {
 #else
 #if MSPACES
 #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)\
    if (m == gm) dlfree(mem); else mspace_free(m,mem);
 #else