From patchwork Thu Aug 29 03:08:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yang.zhang" X-Patchwork-Id: 96646 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D43F6385DDF1 for ; Thu, 29 Aug 2024 03:09:00 +0000 (GMT) X-Original-To: newlib@sourceware.org Delivered-To: newlib@sourceware.org Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) by sourceware.org (Postfix) with ESMTP id 3BB093858D39 for ; Thu, 29 Aug 2024 03:08:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BB093858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=163.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3BB093858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=220.197.31.3 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724900925; cv=none; b=yEunGR2kOCZizQkZEVrmv+nAlOIwyHbGew6aTtUtI313A+mDbK6fvPU93yWqDMr7iOMWpxW1K8Nc1gF4fbnlBNO1gGTI7B/usoLEikNtu8cOOzAZIn/sMCCMvmAhTSzBtTHbhli+5hsMaL8334Xkw2nbJDlkENh9/8X/YcOF4pQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1724900925; c=relaxed/simple; bh=4qKvQiHdDnX6wRn5SnG2+B7zSnlvg9yGn5KmDKnb0vk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Usq2O+LCgtIl+VqkL1AeNATeQywOvLRiR0kN2kMqK9kPmn8s9b34vkD/zqfTgvNgZq7W4a5ocmblqwXRepyc3YVTo8VLYNYWOYuEuwyLFZFBOggBV8YOIz94roX05taK7BhqB33KoDQrFGSK9cDUrgb1NJass8NL4WD4PnWxTeY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=E7++i b1S9cKmNDE7oJ0ooYoowTvkjVyOvDLteiXm2ws=; b=fEcPaAe7Qtuk71pGeqSic jms3aS65ROlFMC7gBMjN7SMcwE68XwFM57JM5TAhHIhht1fVrWoSXFHpP/Zsc9Ge E2s/EE94s/lkMTa57bkms2Q6XoLmam6Mgq3QXKCCJArv8GKB6e6sX1HLR7Ri8S8s vUCDKMRZ0HIT4VnOiFRxDo= Received: from DESKTOP-SGR2QVI.localdomain (unknown [123.150.8.43]) by gzsmtp5 (Coremail) with SMTP id tCgvCgAnXB0u5s9m+pbPAA--.53346S2; Thu, 29 Aug 2024 11:08:30 +0800 (CST) From: "yang.zhang" To: newlib@sourceware.org Cc: jjohnstn@redhat.com, joel.sherrill@oarcorp.com, "yang.zhang" Subject: [PATCH v1] Replace __restrict with __restrict_arr in regex.h Date: Thu, 29 Aug 2024 11:08:04 +0800 Message-Id: <20240829030804.30608-1-gaoshanliukou@163.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: tCgvCgAnXB0u5s9m+pbPAA--.53346S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kw1rXw4fKF4xXFW5Kw4Uurg_yoW8WFW8pa 4DZ34UKw45W34kuw4xZF4rtryxCa9xCF1Fy3y5uF1a9r9Iq3W3WFs2kr1Yva47Jayqq3yS 9w1Igr1rtw1UJrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jeq2tUUUUU= X-Originating-IP: [123.150.8.43] X-CM-SenderInfo: pjdr2x5dqox3xnrxqiywtou0bp/1tbiJxRJ8mXAnhOxIAABsw X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: newlib-bounces~patchwork=sourceware.org@sourceware.org From: "yang.zhang" when a C++ source file include this header file, it would build fail. Signed-off-by: yang.zhang --- Such as i build libgest, which would include regex.h, then it build fail. The failure is relate to commit 3c75fac130b5. In file included from ../../../cpukit/libgtest/googletest/googletest/include/gtest/internal/gtest-port.h:451, from ../../../cpukit/libgtest/googletest/googletest/include/gtest/internal/gtest-internal.h:39, from ../../../cpukit/libgtest/googletest/googletest/include/gtest/gtest.h:58, from ../../../cpukit/libgtest/googletest/googletest/src/gtest-all.cc:39: /home/yangzhang/software/toolchain/toolchain/aarch64-rtems6/include/regex.h:99:45: error: expected primary-expression before '__restrict' 99 | size_t, regmatch_t [__restrict], int); Signed-off-by: yang.zhang --- newlib/libc/include/regex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newlib/libc/include/regex.h b/newlib/libc/include/regex.h index fa3e26879..4da1a374e 100644 --- a/newlib/libc/include/regex.h +++ b/newlib/libc/include/regex.h @@ -96,7 +96,7 @@ __BEGIN_DECLS int regcomp(regex_t *__restrict, const char *__restrict, int); size_t regerror(int, const regex_t *__restrict, char *__restrict, size_t); int regexec(const regex_t *__restrict, const char *__restrict, - size_t, regmatch_t [__restrict], int); + size_t, regmatch_t [__restrict_arr], int); void regfree(regex_t *); __END_DECLS