merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 16886b65a6111423a08349a73400f791eaf4e18d..883088ea6dff13cb16cfd0a91ef6e6a341aa132a 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -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>
 
        * mpw/: Remove subdirectory and everything in it.

diff --git a/include/hashtab.h b/include/hashtab.h
index f7bd4ae69d38cd18eb2b9dd56903f6ee7f5af710..1af7368d338bd44cdc462b7ecdb31784c8e70b6b 100644 (file)
--- a/include/hashtab.h
+++ b/include/hashtab.h
@@ -99,7 +99,7 @@ struct htab GTY(())
   htab_del del_f;
 
   /* 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 */
   size_t size;
@@ -123,7 +123,7 @@ struct htab GTY(())
   htab_free free_f;
 
   /* 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_free_with_arg free_with_arg_f;
 };

diff --git a/include/splay-tree.h b/include/splay-tree.h
index 86707fc1d2fff4a3927e39142dc0b7690c396b51..e05aeb5afb8444760edef13b15fa3d7327f4add5 100644 (file)
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -81,21 +81,21 @@ typedef void (*splay_tree_deallocate_fn) PARAMS((void *, void *));
 struct splay_tree_node_s GTY(())
 {
   /* The key.  */
-  splay_tree_key GTY ((use_param1 (""))) key;
+  splay_tree_key GTY ((use_param1)) key;
 
   /* The value.  */
-  splay_tree_value GTY ((use_param2 (""))) value;
+  splay_tree_value GTY ((use_param2)) value;
 
   /* The left and right children, respectively.  */
-  splay_tree_node GTY ((use_params (""))) left;
-  splay_tree_node GTY ((use_params (""))) right;
+  splay_tree_node GTY ((use_params)) left;
+  splay_tree_node GTY ((use_params)) right;
 };
 
 /* The splay tree itself.  */
 struct splay_tree_s GTY(())
 {
   /* The root of the tree.  */
-  splay_tree_node GTY ((use_params (""))) root;
+  splay_tree_node GTY ((use_params)) root;
 
   /* The comparision function.  */
   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.  */
   splay_tree_allocate_fn allocate;
   splay_tree_deallocate_fn deallocate;
-  PTR GTY((skip (""))) allocate_data;
+  PTR GTY((skip)) allocate_data;
 
 };
 typedef struct splay_tree_s *splay_tree;