aboutsummaryrefslogtreecommitdiffstats
path: root/main/cvs/cvs-1.12.12-hash-nameclash.patch
blob: 95fd61e0a51a9271d52724a543d602193fcdc37d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a

--- a/src/hash.h.orig	2005-02-01 22:56:48 +0100
+++ b/src/hash.h	2010-03-10 19:00:11 +0100
@@ -27,26 +27,26 @@
 };
 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;
-    void (*delproc) (struct node *);
+    void (*delproc) (struct hashnode *);
 };
-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);