summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/shared.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2013-08-30 21:02:02 +0000
committerChristopher Faylor <me@cgf.cx>2013-08-30 21:02:02 +0000
commit6fc77d3e7560233d2722ab8fc09565a39ba64ebb (patch)
treeac58da275816d32e43205464386cecce5a7b2850 /winsup/cygwin/shared.cc
parent9f0de58c2284a74df0e8baf5f8b87f0b1f97c776 (diff)
downloadcygnal-6fc77d3e7560233d2722ab8fc09565a39ba64ebb.tar.gz
cygnal-6fc77d3e7560233d2722ab8fc09565a39ba64ebb.tar.bz2
cygnal-6fc77d3e7560233d2722ab8fc09565a39ba64ebb.zip
* 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.
Diffstat (limited to 'winsup/cygwin/shared.cc')
-rw-r--r--winsup/cygwin/shared.cc3
1 files changed, 2 insertions, 1 deletions
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