OSDN Git Service

include/
[pf3gnuchains/gcc-fork.git] / include / splay-tree.h
index e05aeb5..bcd2a3d 100644 (file)
@@ -52,30 +52,30 @@ typedef struct splay_tree_node_s *splay_tree_node;
 
 /* The type of a function which compares two splay-tree keys.  The
    function should return values as for qsort.  */
-typedef int (*splay_tree_compare_fn) PARAMS((splay_tree_key, splay_tree_key));
+typedef int (*splay_tree_compare_fn) (splay_tree_key, splay_tree_key);
 
 /* The type of a function used to deallocate any resources associated
    with the key.  */
-typedef void (*splay_tree_delete_key_fn) PARAMS((splay_tree_key));
+typedef void (*splay_tree_delete_key_fn) (splay_tree_key);
 
 /* The type of a function used to deallocate any resources associated
    with the value.  */
-typedef void (*splay_tree_delete_value_fn) PARAMS((splay_tree_value));
+typedef void (*splay_tree_delete_value_fn) (splay_tree_value);
 
 /* The type of a function used to iterate over the tree.  */
-typedef int (*splay_tree_foreach_fn) PARAMS((splay_tree_node, void*));
+typedef int (*splay_tree_foreach_fn) (splay_tree_node, void*);
 
 /* The type of a function used to allocate memory for tree root and
    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) PARAMS((int, void *));
+typedef PTR (*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
    memory to be freed; the latter is a data pointer the splay tree
    functions pass through to the freer.  */
-typedef void (*splay_tree_deallocate_fn) PARAMS((void *, void *));
+typedef void (*splay_tree_deallocate_fn) (void *, void *);
 
 /* The nodes in the splay tree.  */
 struct splay_tree_node_s GTY(())
@@ -114,43 +114,28 @@ struct splay_tree_s GTY(())
 };
 typedef struct splay_tree_s *splay_tree;
 
-extern splay_tree splay_tree_new        PARAMS((splay_tree_compare_fn,
-                                               splay_tree_delete_key_fn,
-                                               splay_tree_delete_value_fn));
-extern splay_tree splay_tree_new_with_allocator
-                                        PARAMS((splay_tree_compare_fn,
-                                               splay_tree_delete_key_fn,
+extern splay_tree splay_tree_new        (splay_tree_compare_fn,
+                                         splay_tree_delete_key_fn,
+                                         splay_tree_delete_value_fn);
+extern splay_tree splay_tree_new_with_allocator (splay_tree_compare_fn,
+                                                 splay_tree_delete_key_fn,
                                                splay_tree_delete_value_fn,
-                                                splay_tree_allocate_fn,
-                                                splay_tree_deallocate_fn,
-                                                void *));
-extern void splay_tree_delete           PARAMS((splay_tree));
-extern splay_tree_node splay_tree_insert          
-                                       PARAMS((splay_tree,
-                                               splay_tree_key,
-                                               splay_tree_value));
-extern void splay_tree_remove          PARAMS((splay_tree,
-                                               splay_tree_key));
-extern splay_tree_node splay_tree_lookup   
-                                        PARAMS((splay_tree,
-                                               splay_tree_key));
-extern splay_tree_node splay_tree_predecessor
-                                        PARAMS((splay_tree,
-                                               splay_tree_key));
-extern splay_tree_node splay_tree_successor
-                                        PARAMS((splay_tree,
-                                               splay_tree_key));
-extern splay_tree_node splay_tree_max
-                                        PARAMS((splay_tree));
-extern splay_tree_node splay_tree_min
-                                        PARAMS((splay_tree));
-extern int splay_tree_foreach           PARAMS((splay_tree,
-                                               splay_tree_foreach_fn,
-                                               void*));
-extern int splay_tree_compare_ints      PARAMS((splay_tree_key,
-                                               splay_tree_key));
-extern int splay_tree_compare_pointers  PARAMS((splay_tree_key,
-                                               splay_tree_key));
+                                                 splay_tree_allocate_fn,
+                                                 splay_tree_deallocate_fn,
+                                                 void *);
+extern void splay_tree_delete           (splay_tree);
+extern splay_tree_node splay_tree_insert (splay_tree,
+                                          splay_tree_key,
+                                          splay_tree_value);
+extern void splay_tree_remove  (splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_lookup (splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_predecessor (splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_successor (splay_tree, splay_tree_key);
+extern splay_tree_node splay_tree_max (splay_tree);
+extern splay_tree_node splay_tree_min (splay_tree);
+extern int splay_tree_foreach (splay_tree, splay_tree_foreach_fn, void*);
+extern int splay_tree_compare_ints (splay_tree_key, splay_tree_key);
+extern int splay_tree_compare_pointers (splay_tree_key,        splay_tree_key);
                                               
 #ifdef __cplusplus
 }