From 1ff9f4b9373620aa923412d7aa90b8d04d940199 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 7 Sep 2001 21:32:07 +0000 Subject: * cygheap.h (init_cygheap): Move heap pointers here. * include/sys/cygwin.h (perprocess): Remove heap pointers. * dcrt0.cc (__cygwin_user_data): Reflect obsolete perprocess stuff. (_dll_crt0): Don't initialize heap pointers. (cygwin_dll_init): Ditto. (release_upto): Use heap pointers from cygheap. * heap.h: Ditto. * fork.cc (fork_parent): Ditto. Don't set heap pointers in ch. (fork_child): Remove obsolete sigproc_fixup_after_fork. * shared.cc (memory_init): Reorganize so that cygheap initialization is called prior to regular heap since regular heap uses cygheap now. * sigproc.cc (proc_subproc): Eliminate zombies allocation. (sigproc_init): Move zombies alloation here. Don't free up array on fork, just reuse it. (sigproc_fixup_after_fork): Eliminate. * sigproc.h: Ditto. * include/cygwin/version.h: Reflect change to perprocess structure. --- winsup/cygwin/resource.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/resource.cc') diff --git a/winsup/cygwin/resource.cc b/winsup/cygwin/resource.cc index 6361c4fd1..cd1b27462 100644 --- a/winsup/cygwin/resource.cc +++ b/winsup/cygwin/resource.cc @@ -124,7 +124,7 @@ getrlimit (int resource, struct rlimit *rlp) if (!VirtualQuery ((LPCVOID) &m, &m, sizeof m)) debug_printf ("couldn't get stack info, returning def.values. %E"); else - { + { rlp->rlim_cur = (DWORD) &m - (DWORD) m.AllocationBase; rlp->rlim_max = (DWORD) m.BaseAddress + m.RegionSize - (DWORD) m.AllocationBase; @@ -174,7 +174,7 @@ setrlimit (int resource, const struct rlimit *rlp) break; case RLIMIT_NOFILE: if (rlp->rlim_cur != RLIM_INFINITY) - return setdtablesize (rlp->rlim_cur); + return setdtablesize (rlp->rlim_cur); break; default: set_errno (EINVAL); -- cgit v1.2.3