merge from gcc
This commit is contained in:
parent
7cc8057ae4
commit
f29d4bb82d
@ -1,3 +1,7 @@
|
|||||||
|
2004-03-30 Zack Weinberg <zack@codesourcery.com>
|
||||||
|
|
||||||
|
* hashtab.h, splay-tree.h: Use new shorter form of GTY markers.
|
||||||
|
|
||||||
2004-03-25 Stan Shebs <shebs@apple.com>
|
2004-03-25 Stan Shebs <shebs@apple.com>
|
||||||
|
|
||||||
* mpw/: Remove subdirectory and everything in it.
|
* mpw/: Remove subdirectory and everything in it.
|
||||||
|
@ -99,7 +99,7 @@ struct htab GTY(())
|
|||||||
htab_del del_f;
|
htab_del del_f;
|
||||||
|
|
||||||
/* Table itself. */
|
/* Table itself. */
|
||||||
PTR * GTY ((use_param (""), length ("%h.size"))) entries;
|
PTR * GTY ((use_param, length ("%h.size"))) entries;
|
||||||
|
|
||||||
/* Current size (in entries) of the hash table */
|
/* Current size (in entries) of the hash table */
|
||||||
size_t size;
|
size_t size;
|
||||||
@ -123,7 +123,7 @@ struct htab GTY(())
|
|||||||
htab_free free_f;
|
htab_free free_f;
|
||||||
|
|
||||||
/* Alternate allocate/free functions, which take an extra argument. */
|
/* Alternate allocate/free functions, which take an extra argument. */
|
||||||
PTR GTY((skip (""))) alloc_arg;
|
PTR GTY((skip)) alloc_arg;
|
||||||
htab_alloc_with_arg alloc_with_arg_f;
|
htab_alloc_with_arg alloc_with_arg_f;
|
||||||
htab_free_with_arg free_with_arg_f;
|
htab_free_with_arg free_with_arg_f;
|
||||||
};
|
};
|
||||||
|
@ -81,21 +81,21 @@ typedef void (*splay_tree_deallocate_fn) PARAMS((void *, void *));
|
|||||||
struct splay_tree_node_s GTY(())
|
struct splay_tree_node_s GTY(())
|
||||||
{
|
{
|
||||||
/* The key. */
|
/* The key. */
|
||||||
splay_tree_key GTY ((use_param1 (""))) key;
|
splay_tree_key GTY ((use_param1)) key;
|
||||||
|
|
||||||
/* The value. */
|
/* The value. */
|
||||||
splay_tree_value GTY ((use_param2 (""))) value;
|
splay_tree_value GTY ((use_param2)) value;
|
||||||
|
|
||||||
/* The left and right children, respectively. */
|
/* The left and right children, respectively. */
|
||||||
splay_tree_node GTY ((use_params (""))) left;
|
splay_tree_node GTY ((use_params)) left;
|
||||||
splay_tree_node GTY ((use_params (""))) right;
|
splay_tree_node GTY ((use_params)) right;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* The splay tree itself. */
|
/* The splay tree itself. */
|
||||||
struct splay_tree_s GTY(())
|
struct splay_tree_s GTY(())
|
||||||
{
|
{
|
||||||
/* The root of the tree. */
|
/* The root of the tree. */
|
||||||
splay_tree_node GTY ((use_params (""))) root;
|
splay_tree_node GTY ((use_params)) root;
|
||||||
|
|
||||||
/* The comparision function. */
|
/* The comparision function. */
|
||||||
splay_tree_compare_fn comp;
|
splay_tree_compare_fn comp;
|
||||||
@ -109,7 +109,7 @@ struct splay_tree_s GTY(())
|
|||||||
/* Allocate/free functions, and a data pointer to pass to them. */
|
/* Allocate/free functions, and a data pointer to pass to them. */
|
||||||
splay_tree_allocate_fn allocate;
|
splay_tree_allocate_fn allocate;
|
||||||
splay_tree_deallocate_fn deallocate;
|
splay_tree_deallocate_fn deallocate;
|
||||||
PTR GTY((skip (""))) allocate_data;
|
PTR GTY((skip)) allocate_data;
|
||||||
|
|
||||||
};
|
};
|
||||||
typedef struct splay_tree_s *splay_tree;
|
typedef struct splay_tree_s *splay_tree;
|
||||||
|
Loading…
Reference in New Issue
Block a user