diff options
| author | DJ Delorie <dj@redhat.com> | 2001-05-08 18:34:36 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2001-05-08 18:34:36 +0400 |
| commit | 791cada5a2d50dbf88ae4f88084aff58ce134584 (patch) | |
| tree | c9673b9ae0ceb37c82e61baeeeadeb79708698b3 /include | |
| parent | c63e9997e64654d873e9d5a3609c7e6f4d51fca1 (diff) | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 6 | ||||
| -rw-r--r-- | include/demangle.h | 6 | ||||
| -rw-r--r-- | include/ternary.h | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 24fb134d9..1cf248342 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2001-05-07 Zack Weinberg <zackw@stanford.edu> + + * demangle.h: Use PARAMS for all prototypes. + * ternary.h: Use PARAMS for all prototypes. Use PTR, not void *. + Make arguments constant where possible. + 2001-05-07 Mark Mitchell <mark@codesourcery.com> * splay-tree.h (splay_tree_max): New function. diff --git a/include/demangle.h b/include/demangle.h index 96f60d728..dc1e1f107 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -139,7 +139,8 @@ enum gnu_v3_ctor_kinds { in the G++ V3 ABI demangling style. Specifically, return an `enum gnu_v3_ctor_kinds' value indicating what kind of constructor it is. */ -extern enum gnu_v3_ctor_kinds is_gnu_v3_mangled_ctor (const char *name); +extern enum gnu_v3_ctor_kinds + is_gnu_v3_mangled_ctor PARAMS ((const char *name)); enum gnu_v3_dtor_kinds { @@ -152,6 +153,7 @@ enum gnu_v3_dtor_kinds { in the G++ V3 ABI demangling style. Specifically, return an `enum gnu_v3_dtor_kinds' value, indicating what kind of destructor it is. */ -extern enum gnu_v3_dtor_kinds is_gnu_v3_mangled_dtor (const char *name); +extern enum gnu_v3_dtor_kinds + is_gnu_v3_mangled_dtor PARAMS ((const char *name)); #endif /* DEMANGLE_H */ diff --git a/include/ternary.h b/include/ternary.h index 2e0c82850..40d442e62 100644 --- a/include/ternary.h +++ b/include/ternary.h @@ -38,13 +38,14 @@ ternary_node; already there, and replace is 0. Otherwise, replaces if it it exists, inserts if it doesn't, and returns the data you passed in. */ -void *ternary_insert (ternary_tree *p, char *s, void *data, int replace); +PTR ternary_insert PARAMS ((ternary_tree *p, const char *s, + PTR data, int replace)); /* Delete the ternary search tree rooted at P. Does NOT delete the data you associated with the strings. */ -void ternary_cleanup (ternary_tree p); +void ternary_cleanup PARAMS ((ternary_tree p)); /* Search the ternary tree for string S, returning the data associated with it if found. */ -void *ternary_search (ternary_tree p, char *s); +PTR ternary_search PARAMS ((const ternary_node *p, const char *s)); #endif |