git: 0f6bc5ca95b7 - stable/14 - vis: relocate _DIAGASSERT() define
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 13 Dec 2023 23:22:47 UTC
The branch stable/14 has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=0f6bc5ca95b73f42d70b8879daf969304c9c21b6
commit 0f6bc5ca95b73f42d70b8879daf969304c9c21b6
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-11-21 00:21:11 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-12-13 23:08:49 +0000
vis: relocate _DIAGASSERT() define
Other similar files from NetBSD define it unconditionally as a local
diff.
Reviewed by: imp (as part of D42686)
(cherry picked from commit db94e7c3f9a2344958667e756015393ad3124b3e)
---
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 <stdio.h>
#include <string.h>
+#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