From 6fc77d3e7560233d2722ab8fc09565a39ba64ebb Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 30 Aug 2013 21:02:02 +0000 Subject: * cygheap.h (user_heap_info::sbrk): Declare new function. (user_heap_info::init): Ditto. * heap.cc (user_heap_info::init): Rename from heap_init(). Avoid explictly using cygheap->user_heap. (sbrk): Use user_heap_info method via cygheap->user_heap. (user_heap_info::sbrk): Renamed from sbrk(). Eliminate explicit use of cygheap->user_heap. Change some pointer arithmetic to use (char *) for consistency. * shared.cc (shared_info::initialize): Change heap_init call to cygheap->user_heap.init. --- winsup/cygwin/shared.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/shared.cc') diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 9cc84593c..ef25c592a 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -341,7 +341,8 @@ shared_info::initialize () else if (cb != sizeof (*this)) system_printf ("size of shared memory region changed from %lu to %u", sizeof (*this), cb); - heap_init (); + /* FIXME? Shouldn't this be in memory_init? */ + cygheap->user_heap.init (); } void -- cgit v1.2.3