diff options
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/heap.cc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 60c3fb319..e4bc02826 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2005-09-14 Christopher Faylor <cgf@timesys.com> + * heap.cc (heap_init): Revert 2005-09-11 patch as it seems to + inexplicably cause problems with emacs. + +2005-09-14 Christopher Faylor <cgf@timesys.com> + Remove some more unneeded 'return;'s throughout. 2005-09-14 Christopher Faylor <cgf@timesys.com> diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc index 7dd74979c..8e420b301 100644 --- a/winsup/cygwin/heap.cc +++ b/winsup/cygwin/heap.cc @@ -34,6 +34,7 @@ extern "C" size_t getpagesize (); void heap_init () { + const DWORD alloctype = MEM_RESERVE; /* 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. */ @@ -47,7 +48,7 @@ heap_init () * to assure contiguous memory. */ cygheap->user_heap.ptr = cygheap->user_heap.top = cygheap->user_heap.base = - VirtualAlloc (NULL, cygheap->user_heap.chunk, MEM_RESERVE | MEM_TOP_DOWN, PAGE_NOACCESS); + VirtualAlloc (NULL, cygheap->user_heap.chunk, alloctype, PAGE_NOACCESS); if (cygheap->user_heap.base) break; cygheap->user_heap.chunk -= 1 * 1024 * 1024; @@ -70,7 +71,7 @@ heap_init () while (1) { p = (char *) VirtualAlloc (cygheap->user_heap.base, reserve_size, - MEM_RESERVE, PAGE_READWRITE); + alloctype, PAGE_READWRITE); if (p) break; if ((reserve_size -= page_const) < allocsize) |