===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/assert.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/include/assert.h	2002/06/10 14:59:01	1.7
--- src/include/assert.h	2002/06/10 19:47:45	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: assert.h,v 1.7 2002/06/10 14:59:01 espie Exp $	*/
  /*	$NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$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,70 ****
  #undef assert
  #undef _assert
  
- #include <sys/cdefs.h>
- 
  #ifdef NDEBUG
! # 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
  #endif
  
  
  __BEGIN_DECLS
  void __assert(const char *, int, const char *);
- void __assert2(const char *, int, const char *, const char *);
  __END_DECLS
--- 49,64 ----
  #undef assert
  #undef _assert
  
  #ifdef NDEBUG
! #define	assert(e)	((void)0)
! #define	_assert(e)	((void)0)
  #else
! #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 *);
  __END_DECLS