From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id EEE6A385C413; Mon, 6 Sep 2021 18:29:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EEE6A385C413 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] nano-malloc: Fix redefined compilation warning X-Act-Checkin: newlib-cygwin X-Git-Author: Torbjorn SVENSSON via Newlib X-Git-Refname: refs/heads/master X-Git-Oldrev: 3d322ac930ca6d2516680fc78e3d3018cc737483 X-Git-Newrev: 522cdab5416071545d29d79b58d1e6828f30e4a0 Message-Id: <20210906182953.EEE6A385C413@sourceware.org> Date: Mon, 6 Sep 2021 18:29:53 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 18:29:54 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=522cdab5416071545d29d79b58d1e6828f30e4a0 commit 522cdab5416071545d29d79b58d1e6828f30e4a0 Author: Torbjorn SVENSSON via Newlib Date: Fri Sep 3 15:54:10 2021 +0000 nano-malloc: Fix redefined compilation warning When newlib is configured with --enable-newlib-reent-check-verify, the assert macro is already defined in the nano-mallocr.c compile unit. Contributed by STMicroelectronics Signed-off-by: Torbjörn SVENSSON Diff: --- newlib/libc/stdlib/nano-mallocr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/newlib/libc/stdlib/nano-mallocr.c b/newlib/libc/stdlib/nano-mallocr.c index 18a16c924..6fb08a616 100644 --- a/newlib/libc/stdlib/nano-mallocr.c +++ b/newlib/libc/stdlib/nano-mallocr.c @@ -40,6 +40,7 @@ #if DEBUG #include #else +#undef assert #define assert(x) ((void)0) #endif