summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2002-08-07 01:22:56 +0000
committerChristopher Faylor <me@cgf.cx>2002-08-07 01:22:56 +0000
commit88de60e449ad4ab39eac2c35628cc185abc669a3 (patch)
tree8969052ac2b401dedc9b29d857748b5f7d3bf1db
parent772f6c3e12a207c923d25fbc04757f01a31fda48 (diff)
downloadcygnal-88de60e449ad4ab39eac2c35628cc185abc669a3.tar.gz
cygnal-88de60e449ad4ab39eac2c35628cc185abc669a3.tar.bz2
cygnal-88de60e449ad4ab39eac2c35628cc185abc669a3.zip
one more change
-rw-r--r--winsup/cygwin/ChangeLog1
-rw-r--r--winsup/cygwin/cygheap.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 93ead8c54..1512949c8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -2,6 +2,7 @@
* cygheap.cc (_csbrk): Avoid !cygheap considerations.
(cygheap_init): Deal with unintialized cygheap issues here.
+ (cheap_init): Move cygheap_max setting here.
2002-08-06 Christopher Faylor <cgf@redhat.com>
Conrad Scott <conrad.scott@dsl.pipex.com
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index fb13fbed6..7ea7a39c3 100644
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -61,6 +61,7 @@ init_cheap ()
api_fatal ("AllocationBase %p, BaseAddress %p, RegionSize %p, State %p\n",
m.AllocationBase, m.BaseAddress, m.RegionSize, m.State);
}
+ cygheap_max = cygheap;
}
static void dup_now (void *, child_info *, unsigned) __attribute__ ((regparm(3)));
@@ -189,7 +190,6 @@ cygheap_init ()
if (!cygheap)
{
init_cheap ();
- cygheap_max = cygheap;
(void) _csbrk (sizeof (*cygheap));
}
if (!cygheap->fdtab)