public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] nano-malloc: Fix redefined compilation warning
Date: Mon,  6 Sep 2021 18:29:53 +0000 (GMT)	[thread overview]
Message-ID: <20210906182953.EEE6A385C413@sourceware.org> (raw)

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

commit 522cdab5416071545d29d79b58d1e6828f30e4a0
Author: Torbjorn SVENSSON via Newlib <newlib@sourceware.org>
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 <torbjorn.svensson@st.com>

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 <assert.h>
 #else
+#undef assert
 #define assert(x) ((void)0)
 #endif


                 reply	other threads:[~2021-09-06 18:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210906182953.EEE6A385C413@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).