summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2002-06-10 19:47:46 +0000
committerMarc Espie <espie@cvs.openbsd.org>2002-06-10 19:47:46 +0000
commita0c9e6d7017537246a83c80d6434cf52cab58163 (patch)
treed8ebb611cd45190ad52fee8ea4031f84bd910da8
parent7cf792e5d7c51e997bb276f46402d3bc000a7d61 (diff)
back-out header change for now.
-rw-r--r--include/assert.h18
1 files changed, 6 insertions, 12 deletions
diff --git a/include/assert.h b/include/assert.h
index 1d728f52cbd..d0c35c7f502 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: assert.h,v 1.7 2002/06/10 14:59:01 espie Exp $ */
+/* $OpenBSD: assert.h,v 1.8 2002/06/10 19:47:45 espie Exp $ */
/* $NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $ */
/*-
@@ -49,22 +49,16 @@
#undef assert
#undef _assert
-#include <sys/cdefs.h>
-
#ifdef NDEBUG
-# define assert(e) ((void)0)
-# define _assert(e) ((void)0)
+#define assert(e) ((void)0)
+#define _assert(e) ((void)0)
#else
-# define _assert(e) assert(e)
-# if __GNUC_PREREQ__(2, 95) || (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-# define assert(e) ((e) ? (void)0 : __assert2(__FILE__, __LINE__, __func__, #e))
-# else
-# define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
-# endif
+#define _assert(e) assert(e)
+#define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
#endif
+#include <sys/cdefs.h>
__BEGIN_DECLS
void __assert(const char *, int, const char *);
-void __assert2(const char *, int, const char *, const char *);
__END_DECLS