diff options
| author | dfr <dfr@FreeBSD.org> | 2008-05-08 11:01:46 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2008-05-08 11:01:46 +0000 |
| commit | 62929665b739d66740a668830f004f9463f3ced9 (patch) | |
| tree | 29031943aed09b2fbdbdc248e2868d86477d1ea3 /contrib/com_err/com_err.h | |
| parent | e240fee79046f8dbba1a0ff52d7d6d7db5d9ecf4 (diff) | |
| download | FreeBSD-src-62929665b739d66740a668830f004f9463f3ced9.zip FreeBSD-src-62929665b739d66740a668830f004f9463f3ced9.tar.gz | |
Merge from the vendor branch and resolve conflicts.
Diffstat (limited to 'contrib/com_err/com_err.h')
| -rw-r--r-- | contrib/com_err/com_err.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/contrib/com_err/com_err.h b/contrib/com_err/com_err.h index 6c1faa4..22f1d5c 100644 --- a/contrib/com_err/com_err.h +++ b/contrib/com_err/com_err.h @@ -32,7 +32,7 @@ */ /* $FreeBSD$ */ -/* $Id: com_err.h,v 1.9 2001/05/11 20:03:36 assar Exp $ */ +/* $Id: com_err.h 15566 2005-07-07 14:58:07Z lha $ */ /* MIT compatible com_err library */ @@ -43,11 +43,12 @@ #include <stdarg.h> #include <com_right.h> +#include <stdarg.h> typedef void (*errf) __P((const char *, long, const char *, va_list)); -const char * error_message __P((long)); -int init_error_table __P((const char**, long, int)); +const char * error_message (long); +int init_error_table (const char**, long, int); void com_err_va __P((const char *, long, const char *, va_list)) __printflike(3, 0); @@ -55,11 +56,11 @@ void com_err_va __P((const char *, long, const char *, va_list)) void com_err __P((const char *, long, const char *, ...)) __printflike(3, 4); -errf set_com_err_hook __P((errf)); -errf reset_com_err_hook __P((void)); +errf set_com_err_hook (errf); +errf reset_com_err_hook (void); -const char *error_table_name __P((int num)); +const char *error_table_name (int num); -void add_to_error_table __P((struct et_list *new_table)); +void add_to_error_table (struct et_list *new_table); #endif /* __COM_ERR_H__ */ |
