From 8c825c1afdd0a1c1626d5beb86e35f317252d99c Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok van der Werven Date: Wed, 24 Oct 2001 18:10:37 +0000 Subject: [PATCH] Add $FreeBSD$. Change assert() macro to print failing function name. Change K&R function prototype wrapper to ANSI prototype. This makes us C99 conforming. --- include/assert.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/assert.h b/include/assert.h index dff9589972b0..3c3fea2293c1 100644 --- a/include/assert.h +++ b/include/assert.h @@ -36,6 +36,7 @@ * SUCH DAMAGE. * * @(#)assert.h 8.2 (Berkeley) 1/21/94 + * $FreeBSD$ */ /* @@ -52,14 +53,16 @@ #else #define _assert(e) assert(e) #ifdef __STDC__ -#define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e)) +#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ + __LINE__, #e)) #else /* PCC */ -#define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, "e")) +#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ + __LINE__, "e")) #endif #endif #include __BEGIN_DECLS -void __assert __P((const char *, int, const char *)); +void __assert(const char *, const char *, int, const char *); __END_DECLS