diff options
| author | DJ Delorie <dj@redhat.com> | 2002-06-06 08:42:06 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2002-06-06 08:42:06 -0400 |
| commit | 917ccc05a69cd748b18e122e6ff985af45a2d894 (patch) | |
| tree | ee2a78db8c92aa4f9b99a630b4cf4c3a85a087d6 /include | |
| parent | 0c7aeb8801580c7c4c495ab0ad509ae645eb6a40 (diff) | |
hashtab.h (htab): Rearrange new members for backward compatibility.
* hashtab.h (htab): Rearrange new members for backward
compatibility.
(htab_create): Don't use a macro that requires other headers.
From-SVN: r54316
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 6 | ||||
| -rw-r--r-- | include/hashtab.h | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 7b1dc5a965a..661e89a1b3e 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2002-06-06 DJ Delorie <dj@redhat.com> + + * hashtab.h (htab): Rearrange new members for backward + compatibility. + (htab_create): Don't use a macro that requires other headers. + 2002-06-05 Geoffrey Keating <geoffk@redhat.com> * hashtab.h (htab_create): Restore prototype for backward diff --git a/include/hashtab.h b/include/hashtab.h index 4e5b4e7dccd..7fb31e48c4e 100644 --- a/include/hashtab.h +++ b/include/hashtab.h @@ -92,10 +92,6 @@ struct htab GTY(()) /* Pointer to cleanup function. */ htab_del del_f; - /* Pointers to allocate/free functions. */ - htab_alloc alloc_f; - htab_free free_f; - /* Table itself. */ PTR * GTY ((use_param (""), length ("%h.size"))) entries; @@ -115,6 +111,10 @@ struct htab GTY(()) /* The following member is used for debugging. Its value is number of collisions fixed for time of work with the hash table. */ unsigned int collisions; + + /* Pointers to allocate/free functions. */ + htab_alloc alloc_f; + htab_free free_f; }; typedef struct htab *htab_t; @@ -132,10 +132,6 @@ extern htab_t htab_create_alloc PARAMS ((size_t, htab_hash, extern htab_t htab_create PARAMS ((size_t, htab_hash, htab_eq, htab_del)); extern htab_t htab_try_create PARAMS ((size_t, htab_hash, htab_eq, htab_del)); -/* Provided for convenience. */ -#define htab_create(SIZE, HASH, EQ, DEL) \ - htab_create_alloc (SIZE, HASH, EQ, DEL, xcalloc, free) - extern void htab_delete PARAMS ((htab_t)); extern void htab_empty PARAMS ((htab_t)); |