Merged in changes from CVS trunk

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-200
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-201
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-202
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-203
   Add entry for macroexpand-all to NEWS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-204
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-205
   Add macroexpand-all to lisp reference manual

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-206
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-207
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-208
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-209
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-210
   More RCS keyword removal

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-211
   File-permission tweaks

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-212
   Checkout from CVS with unexpanded RCS keywords


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-136

1 files changed, 12 insertions, 1 deletions

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 99fa36d073a..eae83a74eb6 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -352,6 +352,10 @@ Cambridge, MA 02139, USA.
 #include <errno.h>
 
 /* How to really get more memory.  */
+#if defined(CYGWIN)
+extern __ptr_t bss_sbrk PP ((ptrdiff_t __size));
+extern int bss_sbrk_did_unexec;
+#endif
 __ptr_t (*__morecore) PP ((ptrdiff_t __size)) = __default_morecore;
 
 /* Debugging hook for `malloc'.  */
@@ -1572,7 +1576,14 @@ __ptr_t
 __default_morecore (increment)
      __malloc_ptrdiff_t increment;
 {
-  __ptr_t result = (__ptr_t) __sbrk (increment);
+  __ptr_t result;
+#if defined(CYGWIN)
+  if (!bss_sbrk_did_unexec)
+    {
+      return bss_sbrk (increment);
+    }
+#endif
+  result = (__ptr_t) __sbrk (increment);
   if (result == (__ptr_t) -1)
     return NULL;
   return result;