From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id C4DF53858D35; Thu, 1 Dec 2022 21:53:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C4DF53858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669931595; bh=oMhvjZGT29zorOfQC187OR/Ae4qnMMrlL5HbJBCd3b0=; h=From:To:Subject:Date:From; b=RZZm9S+3ar56cUr9heEv2bVhYXwNHKb3ccb1ecsYmxD/Y+NtxbeAJ9fwlfSmdM2/Z sWmx66E5A5NZxcG3TxTViPQwzSlv2hbMVRm6dbTR2f5azIKtAqA9UFyEQlcAx7rH3X IyY1bg3aijsOyIcUAkGXMlVJhncL6/pDN8cz60K4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: multiple_cygwin_problem: drop obsolete check for "cygheap" X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: a263fe0b268580273c1adc4b1bad256147990222 X-Git-Newrev: e358f8d12f1537a7d0509984207a700205b2c20f Message-Id: <20221201215315.C4DF53858D35@sourceware.org> Date: Thu, 1 Dec 2022 21:53:15 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3De358f8d12f1= 537a7d0509984207a700205b2c20f commit e358f8d12f1537a7d0509984207a700205b2c20f Author: Corinna Vinschen AuthorDate: Thu Dec 1 21:20:44 2022 +0100 Commit: Corinna Vinschen CommitDate: Thu Dec 1 21:20:53 2022 +0100 Cygwin: multiple_cygwin_problem: drop obsolete check for "cygheap" =20 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. =20 Fixes: 2f9b8ff00cce ("Cygwin: decouple cygheap from Cygwin DLL") Signed-off-by: Corinna Vinschen 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, uintpt= r_t version) { - if (_cygwin_testing && (strstr (what, "proc") || strstr (what, "cygheap"= ))) + if (_cygwin_testing && (strstr (what, "proc"))) { child_proc_info->type =3D _CH_WHOOPS; return;