From nobody Fri Oct 8 06:10:42 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2DB7E12D3156; Fri, 8 Oct 2021 06:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HQd930J40z3Ky2; Fri, 8 Oct 2021 06:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE701217E7; Fri, 8 Oct 2021 06:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1986Agnh007079; Fri, 8 Oct 2021 06:10:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1986Aga2007078; Fri, 8 Oct 2021 06:10:42 GMT (envelope-from git) Date: Fri, 8 Oct 2021 06:10:42 GMT Message-Id: <202110080610.1986Aga2007078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3b93fb61a9f9 - stable/12 - loader: use #elif defined() in stand.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3b93fb61a9f99898fdf5e48e8386e773df0d44cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3b93fb61a9f99898fdf5e48e8386e773df0d44cb commit 3b93fb61a9f99898fdf5e48e8386e773df0d44cb Author: Toomas Soome AuthorDate: 2020-03-29 06:48:59 +0000 Commit: Kyle Evans CommitDate: 2021-10-08 02:42:36 +0000 loader: use #elif defined() in stand.h Small cleanup. (cherry picked from commit 5292d0a7f308907bd9c3b37d42d348a144d05978) --- stand/libsa/stand.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index 086e1d298a49..7f0967fb5079 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -444,7 +444,7 @@ extern void *calloc(size_t, size_t); extern void free(void *); extern void *realloc(void *, size_t); extern void *reallocf(void *, size_t); -#elif DEBUG_MALLOC +#elif defined(DEBUG_MALLOC) #define malloc(x) Malloc(x, __FILE__, __LINE__) #define memalign(x, y) Memalign(x, y, __FILE__, __LINE__) #define calloc(x, y) Calloc(x, y, __FILE__, __LINE__)