--- Libc/Libc-825.24/include/err.h
+++ Libc/Libc-391.4.2/include/err.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, 2004, 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -67,26 +67,22 @@
  */
 #include <sys/cdefs.h>
 #include <_types.h>
-#include <Availability.h>
 
 __BEGIN_DECLS
-void	err(int, const char *, ...) __dead2 __printflike(2, 3);
-void	verr(int, const char *, __darwin_va_list) __dead2 __printflike(2, 0);
-void	errc(int, int, const char *, ...) __dead2 __printflike(3, 4);
-void	verrc(int, int, const char *, __darwin_va_list) __dead2 __printflike(3, 0);
-void	errx(int, const char *, ...) __dead2 __printflike(2, 3);
-void	verrx(int, const char *, __darwin_va_list) __dead2 __printflike(2, 0);
-void	warn(const char *, ...) __printflike(1, 2);
-void	vwarn(const char *, __darwin_va_list) __printflike(1, 0);
-void	warnc(int, const char *, ...) __printflike(2, 3);
-void	vwarnc(int, const char *, __darwin_va_list) __printflike(2, 0);
-void	warnx(const char *, ...) __printflike(1, 2);
-void	vwarnx(const char *, __darwin_va_list) __printflike(1, 0);
+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));
-#ifdef __BLOCKS__
-void	err_set_exit_b(void (^)(int)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
-#endif /* __BLOCKS__ */
 
 __END_DECLS