https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=e1fcd10b48775a92b3fe7b13d2c702fab48dfff8

commit e1fcd10b48775a92b3fe7b13d2c702fab48dfff8
Author:     Corinna Vinschen <[email protected]>
AuthorDate: Wed Jan 18 20:07:10 2023 +0100
Commit:     Corinna Vinschen <[email protected]>
CommitDate: Wed Jan 18 20:13:38 2023 +0100

    Cygwin: memory_init: initialize user heap here
    
    Eventually move user heap initialization to memory_init.
    The call order is not changed. Drop a now useless comment.
    
    Signed-off-by: Corinna Vinschen <[email protected]>

Diff:
---
 winsup/cygwin/mm/shared.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/winsup/cygwin/mm/shared.cc b/winsup/cygwin/mm/shared.cc
index e68b506a9fff..40cdd472286e 100644
--- a/winsup/cygwin/mm/shared.cc
+++ b/winsup/cygwin/mm/shared.cc
@@ -319,14 +319,13 @@ shared_info::initialize ()
   else if (cb != sizeof (*this))
     system_printf ("size of shared memory region changed from %lu to %u",
                   sizeof (*this), cb);
-  /* FIXME? Shouldn't this be in memory_init? */
-  cygheap->user_heap.init ();
 }
 
 void
 memory_init ()
 {
   shared_info::create ();      /* Initialize global shared memory */
+  cygheap->user_heap.init ();  /* Initialize user heap */
   user_info::create (false);   /* Initialize per-user shared memory */
   /* Initialize tty list session stuff.  Doesn't really belong here but
      this needs to be initialized before any tty or console manipulation

Reply via email to