diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-09-02 04:51:09 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-09-02 04:51:09 +0000 |
| commit | b8a66ba2cdef71c64a38ba3cc5609df3da41620e (patch) | |
| tree | aaf3c05def84c2051de08dba632e74216966c6f8 /winsup/cygwin/heap.cc | |
| parent | 7a1bf10a8433261a1dd4ae86b76750716d358569 (diff) | |
| download | cygnal-b8a66ba2cdef71c64a38ba3cc5609df3da41620e.tar.gz cygnal-b8a66ba2cdef71c64a38ba3cc5609df3da41620e.tar.bz2 cygnal-b8a66ba2cdef71c64a38ba3cc5609df3da41620e.zip | |
revert inexplicable previous checkin
Diffstat (limited to 'winsup/cygwin/heap.cc')
| -rw-r--r-- | winsup/cygwin/heap.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc index bd1b2e3c2..9f86f9911 100644 --- a/winsup/cygwin/heap.cc +++ b/winsup/cygwin/heap.cc @@ -34,11 +34,9 @@ extern "C" size_t getpagesize (); void heap_init () { -static int seen = 0; /* If we're the forkee, we must allocate the heap at exactly the same place as our parent. If not, we don't care where it ends up. */ -seen++; page_const = system_info.dwPageSize; if (!cygheap->user_heap.base) { @@ -75,11 +73,11 @@ seen++; MEM_RESERVE, PAGE_READWRITE); if (p) break; - if ((reserve_size -= page_const) < allocsize) + if ((reserve_size -= page_const) <= allocsize) break; } if (!p) - api_fatal ("couldn't allocate heap, %E, base %p, top %p, " + api_fatal ("couldn't allocate cygwin heap, %E, base %p, top %p, " "reserve_size %d, allocsize %d, page_const %d", cygheap->user_heap.base, cygheap->user_heap.top, reserve_size, allocsize, page_const); |