===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/err.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/include/err.h	2003/06/02 19:34:12	1.9
--- src/include/err.h	2006/01/06 18:53:04	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: err.h,v 1.9 2003/06/02 19:34:12 millert Exp $	*/
  /*	$NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: err.h,v 1.10 2006/01/06 18:53:04 millert Exp $	*/
  /*	$NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $	*/
  
  /*-
***************
*** 40,67 ****
   * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
   * of them here we may collide with the utility's includes.  It's unreasonable
   * for utilities to have to include one of them to include err.h, so we get
!  * _BSD_VA_LIST_ from <machine/ansi.h> and use it.
   */
- #include <machine/ansi.h>
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS
  
  __dead void	err(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	verr(int, const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 2, 0)));
  __dead void	errx(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	verrx(int, const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 2, 0)));
  void		warn(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		vwarn(const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 1, 0)));
  void		warnx(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		vwarnx(const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 1, 0)));
  
  /*
--- 40,67 ----
   * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
   * of them here we may collide with the utility's includes.  It's unreasonable
   * for utilities to have to include one of them to include err.h, so we get
!  * __va_list from <machine/_types.h> and use it.
   */
  #include <sys/cdefs.h>
+ #include <machine/_types.h>
  
  __BEGIN_DECLS
  
  __dead void	err(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	verr(int, const char *, __va_list)
  			__attribute__((__format__ (printf, 2, 0)));
  __dead void	errx(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	verrx(int, const char *, __va_list)
  			__attribute__((__format__ (printf, 2, 0)));
  void		warn(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		vwarn(const char *, __va_list)
  			__attribute__((__format__ (printf, 1, 0)));
  void		warnx(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		vwarnx(const char *, __va_list)
  			__attribute__((__format__ (printf, 1, 0)));
  
  /*
***************
*** 70,88 ****
   */
  __dead void	_err(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	_verr(int, const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 2, 0)));
  __dead void	_errx(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	_verrx(int, const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 2, 0)));
  void		_warn(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		_vwarn(const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 1, 0)));
  void		_warnx(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		_vwarnx(const char *, _BSD_VA_LIST_)
  			__attribute__((__format__ (printf, 1, 0)));
  
  __END_DECLS
--- 70,88 ----
   */
  __dead void	_err(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	_verr(int, const char *, __va_list)
  			__attribute__((__format__ (printf, 2, 0)));
  __dead void	_errx(int, const char *, ...)
  			__attribute__((__format__ (printf, 2, 3)));
! __dead void	_verrx(int, const char *, __va_list)
  			__attribute__((__format__ (printf, 2, 0)));
  void		_warn(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		_vwarn(const char *, __va_list)
  			__attribute__((__format__ (printf, 1, 0)));
  void		_warnx(const char *, ...)
  			__attribute__((__format__ (printf, 1, 2)));
! void		_vwarnx(const char *, __va_list)
  			__attribute__((__format__ (printf, 1, 0)));
  
  __END_DECLS