From 6a4878cf1617f051e4706ce30f7c8607ebf2e85d Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 29 Jan 2001 00:46:25 +0000 Subject: * syscalls.cc (_link): Make sure that newpath does not exist. Set errno if it does. * cygheap.cc (init_cheap): Don't specify a load address for the heap. It doesn't work on #!*& Windows 9x. (cygheap_init): Move GetUserName to memory_init. * dcrt0.cc (dll_crt0_1): Call new memory_init functin, eliminate call to heap_init. * heap.cc (heap_init): Improve error output. * heap.h: Correct some declarations. * shared.cc (mount_table_init): Remove. (memory_init): Renamed from shared_init. Reorganize to accomodate strange Windows 9x problems with cygheap/heap interaction. * shared_info.h: Rename shared_init to memory_init. --- winsup/cygwin/cygheap.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'winsup/cygwin/cygheap.cc') diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc index 10c16d1a2..49a819a65 100644 --- a/winsup/cygwin/cygheap.cc +++ b/winsup/cygwin/cygheap.cc @@ -27,8 +27,7 @@ static NO_COPY muto *cygheap_protect = NULL; inline static void init_cheap () { - void *addr = cygheap_address; - cygheap = (init_cygheap *) VirtualAlloc (addr, CYGHEAPSIZE, MEM_RESERVE, PAGE_NOACCESS); + cygheap = (init_cygheap *) VirtualAlloc (NULL, CYGHEAPSIZE, MEM_RESERVE, PAGE_NOACCESS); if (!cygheap) api_fatal ("Couldn't reserve space for cygwin's heap, %E"); cygheap_max = cygheap + 1; @@ -67,14 +66,6 @@ cygheap_init () { cygheap_protect = new_muto (FALSE, "cygheap_protect"); _csbrk (0); - - char username[MAX_USER_NAME]; - DWORD username_len = MAX_USER_NAME; - - if (!GetUserName (username, &username_len)) - cygheap->user.set_name ("unknown"); - else - cygheap->user.set_name (username); } /* Copyright (C) 1997, 2000 DJ Delorie */ -- cgit v1.2.3