[newlib-cygwin] Cygwin: multiple_cygwin_problem: drop obsolete check for "cygheap"

Corinna Vinschen corinna@sourceware.org
Thu Dec 1 21:53:15 GMT 2022


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

commit e358f8d12f1537a7d0509984207a700205b2c20f
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Thu Dec 1 21:20:44 2022 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Thu Dec 1 21:20:53 2022 +0100

    Cygwin: multiple_cygwin_problem: drop obsolete check for "cygheap"
    
    After decoupling cygheap from the DLL loading address, the check
    for a different _cygheap_start has gone.  So the matching string
    check in multiple_cygwin_problem is obsolete now.
    
    Fixes: 2f9b8ff00cce ("Cygwin: decouple cygheap from Cygwin DLL")
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/dcrt0.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 84db38cfe0a4..e5f19f1f930d 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -1262,7 +1262,7 @@ api_fatal (const char *fmt, ...)
 void
 multiple_cygwin_problem (const char *what, uintptr_t magic_version, uintptr_t version)
 {
-  if (_cygwin_testing && (strstr (what, "proc") || strstr (what, "cygheap")))
+  if (_cygwin_testing && (strstr (what, "proc")))
     {
       child_proc_info->type = _CH_WHOOPS;
       return;


More information about the Cygwin-cvs mailing list