summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>1999-12-05 18:13:48 +0000
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>1999-12-05 18:13:48 +0000
commitb04bbebba35dcf57b50dd6fbb658bf79768f9187 (patch)
tree3df67b5a266aafe717e4a4b1087aa2cbe39bf704
parentcd25c88308389d66bea2f19c9976eaf067ee6c71 (diff)
downloadgcc-b04bbebba35dcf57b50dd6fbb658bf79768f9187.tar.gz
* splay-tree.h (struct splay_tree_node): Rename to ...
(struct splay_tree_node_s): ... this. (struct splay_tree): Rename to ... (struct splay_tree_s): ... this. * splay-tree.c (splay_tree_new): Use struct splay_tree_node_s rather than struct splay_tree_node. (splay_tree_insert): Use struct splay_tree_s rather than struct splay_tree. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30790 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--include/ChangeLog7
-rw-r--r--include/splay-tree.h6
-rw-r--r--libiberty/ChangeLog7
-rw-r--r--libiberty/splay-tree.c4
4 files changed, 19 insertions, 5 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index f47d87f1c9d..5fa66e0cae9 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,10 @@
+1999-12-05 Mark Mitchell <mark@codesourcery.com>
+
+ * splay-tree.h (struct splay_tree_node): Rename to ...
+ (struct splay_tree_node_s): ... this.
+ (struct splay_tree): Rename to ...
+ (struct splay_tree_s): ... this.
+
1999-11-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* ansidecl.h (ATTRIBUTE_MALLOC): New macro.
diff --git a/include/splay-tree.h b/include/splay-tree.h
index 307cf054e12..6d70c8d9075 100644
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -44,7 +44,7 @@ typedef unsigned long int splay_tree_key;
typedef unsigned long int splay_tree_value;
/* Forward declaration for a node in the tree. */
-typedef struct splay_tree_node *splay_tree_node;
+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. */
@@ -62,7 +62,7 @@ typedef void (*splay_tree_delete_value_fn) PARAMS((splay_tree_value));
typedef int (*splay_tree_foreach_fn) PARAMS((splay_tree_node, void*));
/* The nodes in the splay tree. */
-struct splay_tree_node
+struct splay_tree_node_s
{
/* The key. */
splay_tree_key key;
@@ -76,7 +76,7 @@ struct splay_tree_node
};
/* The splay tree itself. */
-typedef struct splay_tree
+typedef struct splay_tree_s
{
/* The root of the tree. */
splay_tree_node root;
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 02e8213e0ed..18f8f0515b1 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+1999-12-05 Mark Mitchell <mark@codesourcery.com>
+
+ * splay-tree.c (splay_tree_new): Use struct splay_tree_node_s
+ rather than struct splay_tree_node.
+ (splay_tree_insert): Use struct splay_tree_s rather than struct
+ splay_tree.
+
Sun Nov 28 00:59:39 1999 Philippe De Muyter <phdm@macqel.be>
* hashtab.c (sys/types.h): File included.
diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c
index a17d0a1176a..22ea07d84ad 100644
--- a/libiberty/splay-tree.c
+++ b/libiberty/splay-tree.c
@@ -235,7 +235,7 @@ splay_tree_new (compare_fn, delete_key_fn, delete_value_fn)
splay_tree_delete_key_fn delete_key_fn;
splay_tree_delete_value_fn delete_value_fn;
{
- splay_tree sp = (splay_tree) xmalloc (sizeof (struct splay_tree));
+ splay_tree sp = (splay_tree) xmalloc (sizeof (struct splay_tree_s));
sp->root = 0;
sp->comp = compare_fn;
sp->delete_key = delete_key_fn;
@@ -284,7 +284,7 @@ splay_tree_insert (sp, key, value)
/* Create a new node, and insert it at the root. */
splay_tree_node node;
- node = (splay_tree_node) xmalloc (sizeof (struct splay_tree_node));
+ node = (splay_tree_node) xmalloc (sizeof (struct splay_tree_node_s));
node->key = key;
node->value = value;