merge from gcc

1 files changed, 2 insertions, 2 deletions

diff --git a/include/splay-tree.h b/include/splay-tree.h
index bcd2a3d4425..ca11711ea11 100644
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -69,7 +69,7 @@ typedef int (*splay_tree_foreach_fn) (splay_tree_node, void*);
    node structures.  The first argument is the number of bytes needed;
    the second is a data pointer the splay tree functions pass through
    to the allocator.  This function must never return zero.  */
-typedef PTR (*splay_tree_allocate_fn) (int, void *);
+typedef void *(*splay_tree_allocate_fn) (int, void *);
 
 /* The type of a function used to free memory allocated using the
    corresponding splay_tree_allocate_fn.  The first argument is the
@@ -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;
+  void * GTY((skip)) allocate_data;
 
 };
 typedef struct splay_tree_s *splay_tree;