From nobody Tue Nov 21 00:21:28 2023 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 4SZ4mm6mg2z51MCq; Tue, 21 Nov 2023 00:21:28 +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 4SZ4mm6GF2z4VXG; Tue, 21 Nov 2023 00:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700526088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYclDWX6w0qVWL0Qorndku4nJwgmEajCCPCR3KJymk8=; b=olCvJcM/iok4hWArjzVWvptOHPynB0ErWuEmo14M4kNwAtsb5QXU7WC+YnWD+5KXqkbNB+ uTf0q9NQgjVdIIEMGT6M0OmLIReuUZfSnRrsJlp8tj0PXuc0U0nm90shXj8/iLvGQzBDto r2sqCz4P9Y3zTwg3TC5NntSnEPlGJ+c6pOgWtAn5w4cz160sNrwE7fgU1o3tq3He4XJXkI n6/5soJ8e0+352ZNUmO75Qrfc4wwDrLzkXEHTmwGC755KOBFEDdLw/xK/uACeueutAvMtE YVuI1nNF12CzkyB/rIpLV7k+zuVvlwsM7Q6OKWQcjA6DDBqUGPItq0a6Ail0MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700526088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYclDWX6w0qVWL0Qorndku4nJwgmEajCCPCR3KJymk8=; b=vUKEOHiYfPCNcUEzHZyi8mQQp31ENuU5Yp0jjo9PHsvx6p6Ih03hNkG66Pt7pxCv5osfK7 1LgSMYKipoFFfIBTiet2gHXqrX/kFX8ZYjxn3JIdZgIO/dF+UbUlyd+uT1QYSAl9rJjcdY TAZH3Xf6futq5df3og4TwiamRL2auNfGqPdm0xGdZF0WcGwvjhIbW5KE/a+2prWaJ+mS7H NXuQFRWqpzvOfY7b5v2V10g7vDZzM7wotJNGllGklpLkjEh7RwioYm2QDYEWJ9Emm7TlfA aXuYrB+I8FDPUbu+dXHRoMTZXH5few9uZGX3M7e6BmqPVYNtqz64z99siYbSZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700526088; a=rsa-sha256; cv=none; b=bltjpwKHcbfq/tWLLfS0dDHabUCgsYpEd/+x0rJ9fBh61q5UZwXP5CUKpXBdGjexvH0oYn fXcxug+QZoqyF2qplMy9SKz6+s4zvVwHO99eXwwppmsiSvwHxOxMjvr+HuWQlbBs3b7kqn qlNpOTAF33lO1aS6PxJImMhcJFaq6UvAc0RkyNAUijnaB/1ux3xuXBMqu1/xUqfGXWy2Wo LL4tEnHBZhhc0DjlFWpVmPnh8h0NHAb9N5l5eueKIyqqY9x2tMyE842UvKLehNUsgGfcZK HTfpiITt+qCeMYhsawkhqqavsgBuavKwc6TJylPoKhwcxAsseAHKkyXs/MJSFA== 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 4SZ4mm5Klpz1C9K; Tue, 21 Nov 2023 00:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AL0LS5i022285; Tue, 21 Nov 2023 00:21:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AL0LShd022282; Tue, 21 Nov 2023 00:21:28 GMT (envelope-from git) Date: Tue, 21 Nov 2023 00:21:28 GMT Message-Id: <202311210021.3AL0LShd022282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: db94e7c3f9a2 - main - vis: relocate _DIAGASSERT() define 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db94e7c3f9a2344958667e756015393ad3124b3e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=db94e7c3f9a2344958667e756015393ad3124b3e commit db94e7c3f9a2344958667e756015393ad3124b3e Author: Brooks Davis AuthorDate: 2023-11-21 00:21:11 +0000 Commit: Brooks Davis CommitDate: 2023-11-21 00:21:11 +0000 vis: relocate _DIAGASSERT() define Other similar files from NetBSD define it unconditionally as a local diff. Reviewed by: imp (as part of D42686) --- contrib/libc-vis/vis.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/libc-vis/vis.c b/contrib/libc-vis/vis.c index fc3b50d6c7a5..2f9eab25b480 100644 --- a/contrib/libc-vis/vis.c +++ b/contrib/libc-vis/vis.c @@ -61,7 +61,6 @@ __RCSID("$NetBSD: vis.c,v 1.83 2023/08/12 12:48:52 riastradh Exp $"); #endif /* LIBC_SCCS and not lint */ #ifdef __FBSDID __FBSDID("$FreeBSD$"); -#define _DIAGASSERT(x) assert(x) #endif #include "namespace.h" @@ -86,6 +85,8 @@ __weak_alias(strvisx,_strvisx) #include #include +#define _DIAGASSERT(x) assert(x) + /* * The reason for going through the trouble to deal with character encodings * in vis(3), is that we use this to safe encode output of commands. This