Libc-391.5.22.tar.gz

[apple/libc.git] / include / err.h

diff --git a/include/err.h b/include/err.h
index 7af694bb16116fa8cbe1965742a48f742509694d..e0cc723be2ebd793ed2a49d00c36b9db4f4b487e 100644 (file)
--- a/include/err.h
+++ b/include/err.h
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -65,20 +63,27 @@
  * 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
  * 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.
+ * __darwin_va_list from <machine/_type.h> and use it.

  */
  */

-#include <machine/ansi.h>

 #include <sys/cdefs.h>
 #include <sys/cdefs.h>

+#include <_types.h>

 
 __BEGIN_DECLS
 
 __BEGIN_DECLS

-__dead void    err __P((int, const char *, ...)) __attribute__((__noreturn__));
-__dead void    verr __P((int, const char *, _BSD_VA_LIST_)) __attribute__((__noreturn__));
-__dead void    errx __P((int, const char *, ...)) __attribute__((__noreturn__));
-__dead void    verrx __P((int, const char *, _BSD_VA_LIST_)) __attribute__((__noreturn__));
-void           warn __P((const char *, ...));
-void           vwarn __P((const char *, _BSD_VA_LIST_));
-void           warnx __P((const char *, ...));
-void           vwarnx __P((const char *, _BSD_VA_LIST_));
+void   err(int, const char *, ...) __DARWIN_LDBL_COMPAT(err) __dead2;
+void   verr(int, const char *, __darwin_va_list) __DARWIN_LDBL_COMPAT(verr) __dead2;
+void   errc(int, int, const char *, ...) __DARWIN_LDBL_COMPAT(errc) __dead2;
+void   verrc(int, int, const char *, __darwin_va_list) __DARWIN_LDBL_COMPAT(verrc) __dead2;
+void   errx(int, const char *, ...) __DARWIN_LDBL_COMPAT(errx) __dead2;
+void   verrx(int, const char *, __darwin_va_list) __DARWIN_LDBL_COMPAT(verrx) __dead2;
+void   warn(const char *, ...) __DARWIN_LDBL_COMPAT(warn);
+void   vwarn(const char *, __darwin_va_list) __DARWIN_LDBL_COMPAT(vwarn);
+void   warnc(int, const char *, ...) __DARWIN_LDBL_COMPAT(warnc);
+void   vwarnc(int, const char *, __darwin_va_list) __DARWIN_LDBL_COMPAT(vwarnc);
+void   warnx(const char *, ...) __DARWIN_LDBL_COMPAT(warnx);
+void   vwarnx(const char *, __darwin_va_list) __DARWIN_LDBL_COMPAT(vwarnx);
+void   err_set_file(void *);
+void   err_set_exit(void (*)(int));
+

 __END_DECLS
 
 #endif /* !_ERR_H_ */
 __END_DECLS
 
 #endif /* !_ERR_H_ */