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_right.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_right.h')
-rw-r--r-- | contrib/com_err/com_right.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/com_err/com_right.h b/contrib/com_err/com_right.h index 09e95fa..74d386d 100644 --- a/contrib/com_err/com_right.h +++ b/contrib/com_err/com_right.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: com_right.h,v 1.11 2000/07/31 01:11:08 assar Exp $ */ +/* $Id: com_right.h 14551 2005-02-03 08:45:13Z lha $ */ /* $FreeBSD$ */ #ifndef __COM_RIGHT_H__ @@ -51,8 +51,8 @@ struct et_list { }; extern struct et_list *_et_list; -const char *com_right __P((struct et_list *list, long code)); -void initialize_error_table_r __P((struct et_list **, const char **, int, long)); -void free_error_table __P((struct et_list *)); +const char *com_right (struct et_list *list, long code); +void initialize_error_table_r (struct et_list **, const char **, int, long); +void free_error_table (struct et_list *); #endif /* __COM_RIGHT_H__ */ |