summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/cygheap.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9be9746a3..243b20cbc 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-11 Christopher Faylor <cgf@alum.bu.edu>
+
+ * cygheap.h (CYGHEAP_SLOP): Reduce drastically to avoid collisions.
+
2004-04-11 Pierre Humblet <pierre.humblet@ieee.org>
* dtable.cc (dtable::extend): Change order of memcpy and cfree.
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index 864fa9729..ef84f18ef 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -272,7 +272,7 @@ struct init_cygheap
void close_ctty ();
};
-#define _CYGHEAPSIZE_SLOP (32 * 1024 * 1024)
+#define _CYGHEAPSIZE_SLOP (128 * 1024)
#define CYGHEAPSIZE (sizeof (init_cygheap) + (20000 * sizeof (fhandler_union)) + _CYGHEAPSIZE_SLOP)
#define CYGHEAPSIZE_MIN (sizeof (init_cygheap) + (10000 * sizeof (fhandler_union)))
@@ -376,4 +376,3 @@ char *__stdcall cstrdup1 (const char *) __attribute__ ((regparm(1)));
void __stdcall cfree_and_set (char *&, char * = NULL) __attribute__ ((regparm(2)));
void __stdcall cygheap_init ();
extern DWORD _cygheap_start;
-}