--- src/include/assert.h	2003/11/14 01:01:43	1.2
+++ src/include/assert.h	2005/01/06 17:32:44	1.3
@@ -52,15 +52,19 @@
 #define	_assert(e)	((void)0)
 #else
 #define	_assert(e)	assert(e)
-#ifdef __STDC__
 #define	assert(e)	((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
-#else	/* PCC */
-#define	assert(e)	((e) ? (void)0 : __assert(__FILE__, __LINE__, "e"))
 #endif
+
+#undef _DIAGASSERT
+#ifdef _DIAGNOSTIC
+#define	_DIAGASSERT(e)	((e) ? (void)0 : __assert(__FILE__, __LINE__, #e))
+#else
+#define	_DIAGASSERT(e)	((void)0)
 #endif
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void __assert (const char *, int, const char *);
+void	__assert(const char *, int, const char *);
+void	__diag_assert(const char *, int, const char *);
 __END_DECLS