===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/assert.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/include/assert.h	2003/07/15 17:31:18	1.10
--- src/include/assert.h	2006/01/13 17:54:30	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: assert.h,v 1.10 2003/07/15 17:31:18 deraadt Exp $	*/
  /*	$NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: assert.h,v 1.11 2006/01/13 17:54:30 millert Exp $	*/
  /*	$NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $	*/
  
  /*-
***************
*** 42,59 ****
   * multiple times, with and without NDEBUG defined.
   */
  
  #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 *);
--- 42,63 ----
   * multiple times, with and without NDEBUG defined.
   */
  
+ #include <sys/cdefs.h>
+ 
  #undef assert
  #undef _assert
  
  #ifdef NDEBUG
! # define	assert(e)	((void)0)
! # define	_assert(e)	((void)0)
  #else
! # define	_assert(e)	assert(e)
! # if __ISO_C_VISIBLE >= 1999
! #  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 *);