From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 463FC1F4B4 for ; Sat, 17 Apr 2021 00:08:11 +0000 (UTC) Received: from localhost ([::1]:53958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXYVN-0000Ww-VK for normalperson@yhbt.net; Fri, 16 Apr 2021 20:08:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXYVJ-0000SY-35 for bug-gnulib@gnu.org; Fri, 16 Apr 2021 20:08:05 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:41424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXYVH-0002HA-5I for bug-gnulib@gnu.org; Fri, 16 Apr 2021 20:08:04 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id BEAAC16011B for ; Fri, 16 Apr 2021 17:07:58 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id Ib-6JOV4jlLe; Fri, 16 Apr 2021 17:07:58 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id AC1AF16010D; Fri, 16 Apr 2021 17:07:57 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id t7JIPOqAVEqx; Fri, 16 Apr 2021 17:07:57 -0700 (PDT) Received: from penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 6C3A7160115; Fri, 16 Apr 2021 17:07:57 -0700 (PDT) From: Paul Eggert To: bug-gnulib@gnu.org Subject: [PATCH] malloc, realloc: fix recently-introduced #undef typos Date: Fri, 16 Apr 2021 17:07:54 -0700 Message-Id: <20210417000754.12854-1-eggert@cs.ucla.edu> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=131.179.128.68; envelope-from=eggert@cs.ucla.edu; helo=zimbra.cs.ucla.edu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Eggert Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" * lib/malloc.c (malloc): * lib/realloc.c (malloc, realloc): #undef before using. --- ChangeLog | 6 ++++++ lib/malloc.c | 3 +++ lib/realloc.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7c519ee44..3207c22cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-04-16 Paul Eggert + + malloc, realloc: fix recently-introduced #undef typos + * lib/malloc.c (malloc): + * lib/realloc.c (malloc, realloc): #undef before using. + 2021-04-14 Bruno Haible =20 hamt tests: Fix link error. diff --git a/lib/malloc.c b/lib/malloc.c index 7b5ae9589..272b8b9f4 100644 --- a/lib/malloc.c +++ b/lib/malloc.c @@ -33,6 +33,9 @@ =20 # include =20 +/* Call the system's malloc below. */ +# undef malloc + /* Allocate an N-byte block of memory from the heap. If N is zero, allocate a 1-byte block. */ =20 diff --git a/lib/realloc.c b/lib/realloc.c index 3bf1bea2d..c3e3cdfc5 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -40,6 +40,10 @@ =20 # include =20 +/* Call the system's malloc and realloc below. */ +# undef malloc +# undef realloc + /* Change the size of an allocated block of memory P to N bytes, with error checking. If N is zero, change it to 1. If P is NULL, use malloc. */ --=20 2.30.2