JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygheap.cc (cygheap_dummy): Rename from cygheap_at_start.

Browse Source 
(cygheap): Accommodate name change to cygheap_dummy.
(cygheap_init): Ditto.
(cygheap_fixup_in_child): Simplify slightly.
* fork.cc (fork): Add an advisory comment.
This commit is contained in:
Christopher Faylor 2011-05-30 06:24:53 +00:00
parent 57b670586c
commit 3a88e09e7f
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2011-05-30 Christopher Faylor <me.cygwin2011@cgf.cx>
* cygheap.cc (cygheap_dummy): Rename from cygheap_at_start.
(cygheap): Accommodate name change to cygheap_dummy.
(cygheap_init): Ditto.
(cygheap_fixup_in_child): Simplify slightly.
* fork.cc (fork): Add an advisory comment.
2011-05-29 Christopher Faylor <me.cygwin2011@cgf.cx> 2011-05-29 Christopher Faylor <me.cygwin2011@cgf.cx>
* fhandler.cc (fhandler_overlapped::wait_overlapped): Make sure that * fhandler.cc (fhandler_overlapped::wait_overlapped): Make sure that

9
winsup/cygwin/cygheap.cc
View File

@ -26,12 +26,12 @@
#include <unistd.h> #include <unistd.h>
#include <wchar.h> #include <wchar.h>
static mini_cygheap NO_COPY cygheap_at_start = static mini_cygheap NO_COPY cygheap_dummy =
{ {
{__utf8_mbtowc, __utf8_wctomb} {__utf8_mbtowc, __utf8_wctomb}
}; };
init_cygheap NO_COPY *cygheap = (init_cygheap *) &cygheap_at_start; init_cygheap NO_COPY *cygheap = (init_cygheap *) &cygheap_dummy;
void NO_COPY *cygheap_max; void NO_COPY *cygheap_max;
extern "C" char _cygheap_end[]; extern "C" char _cygheap_end[];
@ -61,8 +61,7 @@ static void *__stdcall _csbrk (int);
void __stdcall void __stdcall
cygheap_fixup_in_child (bool execed) cygheap_fixup_in_child (bool execed)
{ {
cygheap_max = child_proc_info->cygheap; cygheap_max = cygheap = (init_cygheap *) _cygheap_start;
cygheap = (init_cygheap *) cygheap_max;
_csbrk ((char *) child_proc_info->cygheap_max - (char *) cygheap); _csbrk ((char *) child_proc_info->cygheap_max - (char *) cygheap);
child_copy (child_proc_info->parent, false, "cygheap", cygheap, cygheap_max, NULL); child_copy (child_proc_info->parent, false, "cygheap", cygheap, cygheap_max, NULL);
cygheap_init (); cygheap_init ();
@ -156,7 +155,7 @@ void __stdcall
cygheap_init () cygheap_init ()
{ {
cygheap_protect.init ("cygheap_protect"); cygheap_protect.init ("cygheap_protect");
if (cygheap == &cygheap_at_start) if (cygheap == &cygheap_dummy)
{ {
cygheap = (init_cygheap *) memset (_cygheap_start, 0, cygheap = (init_cygheap *) memset (_cygheap_start, 0,
sizeof (*cygheap)); sizeof (*cygheap));

1
winsup/cygwin/fork.cc
View File

@ -601,6 +601,7 @@ extern "C" int
fork () fork ()
{ {
frok grouped; frok grouped;
/* No cygheap allocation beyond this point. */
debug_printf ("entering"); debug_printf ("entering");
grouped.load_dlls = 0; grouped.load_dlls = 0;