merge from gcc

diff --git a/include/hashtab.h b/include/hashtab.h
index 77eee14e94f3cbf5c876b5c16dbb28f6264123cd..4f67448a9af8f15d947e35988158353018e0736c 100644 (file)
--- a/include/hashtab.h
+++ b/include/hashtab.h
@@ -96,8 +96,7 @@ typedef void (*htab_free_with_arg) (void *, void *);
    functions mentioned below.  The size of this structure is subject to
    change.  */
 
-struct htab GTY(())
-{
+struct GTY(()) htab {
   /* Pointer to hash function.  */
   htab_hash hash_f;
 

diff --git a/include/splay-tree.h b/include/splay-tree.h
index b03c581e0b2c261b17997f0d3865af9e637f3469..8f236e09ccf6d7aa735c116744dbc6ac3944c864 100644 (file)
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -86,8 +86,7 @@ typedef void *(*splay_tree_allocate_fn) (int, void *);
 typedef void (*splay_tree_deallocate_fn) (void *, void *);
 
 /* The nodes in the splay tree.  */
-struct splay_tree_node_s GTY(())
-{
+struct GTY(()) splay_tree_node_s {
   /* The key.  */
   splay_tree_key GTY ((use_param1)) key;
 
@@ -100,8 +99,7 @@ struct splay_tree_node_s GTY(())
 };
 
 /* The splay tree itself.  */
-struct splay_tree_s GTY(())
-{
+struct GTY(()) splay_tree_s {
   /* The root of the tree.  */
   splay_tree_node GTY ((use_params)) root;