>From 147828bccdcbb7af648d24ef9eaa68e9cb6b89d2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 21 Apr 2021 11:09:01 -0700 Subject: [PATCH 1/2] malloc: simplify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lib/malloc.c: Omit unnecessary "#undef malloc". I recently introduced it by mistake. This module defines _GL_USE_STDLIB_ALLOC and so malloc isn’t redefined to rpl_malloc. --- ChangeLog | 5 +++++ lib/malloc.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e72362077..b013d915f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2021-04-21 Paul Eggert + malloc: simplify + * lib/malloc.c: Omit unnecessary "#undef malloc". + I recently introduced it by mistake. This module defines + _GL_USE_STDLIB_ALLOC and so malloc isn’t redefined to rpl_malloc. + malloca: avoid ptrdiff_t overflow * lib/malloca.c: Include idx.h, intprops.h. (mmalloca): Check for ptrdiff_t overflow. Since this module uses diff --git a/lib/malloc.c b/lib/malloc.c index a900046ec..30f791fb9 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -26,9 +26,6 @@ #include "xalloc-oversized.h" -/* Call the system's malloc below. */ -# undef malloc - /* Allocate an N-byte block of memory from the heap, even if N is 0. */ void * -- 2.27.0