diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ebc3951a6..cfe2ae666 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -48,7 +48,7 @@ case match. 2002-10-24 Pierre Humblet - + * pwdgrp.h (pwdgrp_read::open): Compare fh to INVALID_HANDLE_VALUE. 2002-10-22 Christopher Faylor diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc index 76e26fe6e..61711e86d 100644 --- a/winsup/cygwin/dll_init.cc +++ b/winsup/cygwin/dll_init.cc @@ -263,7 +263,7 @@ release_upto (const char *name, DWORD here) if (!(mb.State == MEM_RESERVE && mb.AllocationProtect == PAGE_NOACCESS && (((void *) start < cygheap->user_heap.base || (void *) start > cygheap->user_heap.top) && - ((void *) start < (void *) cygheap + ((void *) start < (void *) cygheap | (void *) start > (void *) ((char *) cygheap + CYGHEAPSIZE))))) continue; if (!VirtualFree ((void *) start, 0, MEM_RELEASE)) diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 78937da36..a21aebbe3 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -245,7 +245,7 @@ shared_info::heap_chunk_size () reg_key r1 (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE", CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_INFO_CYGWIN_REGISTRY_NAME, NULL); - heap_chunk = reg.get_int ("heap_chunk_in_mb", 384); + heap_chunk = reg.get_int ("heap_chunk_in_mb", 384); } if (heap_chunk < 4)