[Cvs-cvs] ccvs/src ChangeLog hash.h

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   06/08/17 18:08:25

Modified files:
        src            : ChangeLog hash.h 

Log message:
        merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3477&r2=1.3478
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/hash.h?cvsroot=cvs&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3477
retrieving revision 1.3478
diff -u -b -r1.3477 -r1.3478
--- ChangeLog   16 Aug 2006 18:12:09 -0000      1.3477
+++ ChangeLog   17 Aug 2006 18:08:25 -0000      1.3478
@@ -1,3 +1,8 @@
+2006-08-17  Larry Jones  <address@hidden>
+
+       * hash.h: Rename structs node and list to hashnode and hashlist
+       to avoid name clashes.
+
 2006-08-16  Mark D. Baushke  <address@hidden>
 
        * Makefile.in: Regenerated.

Index: hash.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/hash.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- hash.h      24 Apr 2006 18:50:26 -0000      1.22
+++ hash.h      17 Aug 2006 18:08:25 -0000      1.23
@@ -32,27 +32,27 @@
 };
 typedef enum ntype Ntype;
 
-struct node
+struct hashnode
 {
     Ntype type;
-    struct node *next;
-    struct node *prev;
-    struct node *hashnext;
-    struct node *hashprev;
+    struct hashnode *next;
+    struct hashnode *prev;
+    struct hashnode *hashnext;
+    struct hashnode *hashprev;
     char *key;
     void *data;
     size_t len;                        /* Length of DATA.  */
     void (*delproc) (struct node *);
 };
-typedef struct node Node;
+typedef struct hashnode Node;
 
-struct list
+struct hashlist
 {
     Node *list;
     Node *hasharray[HASHSIZE];
-    struct list *next;
+    struct hashlist *next;
 };
-typedef struct list List;
+typedef struct hashlist List;
 
 List *getlist (void);
 Node *findnode (List *list, const char *key);