add upstream compile fixes needed for AIX

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

9 files changed, 178 insertions, 8 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index c9ab1ed229b2..4eeaa462ada9 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cvs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.139 2010/02/25 08:16:36 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.140 2010/03/11 10:32:40 haubi Exp $
+
+  11 Mar 2010; Michael Haubenwallner <haubi@gentoo.org>
+  cvs-1.11.22.1-r1.ebuild, +files/cvs-1.11.22.1-hash-nameclash.patch,
+  cvs-1.12.12-r7.ebuild, +files/cvs-1.12.12-hash-nameclash.patch,
+  cvs-1.12.13.1.ebuild, +files/cvs-1.12.13.1-gl-mempcpy.patch,
+  +files/cvs-1.12.13.1-hash-nameclash.patch:
+  add upstream compile fixes needed for AIX
 
   25 Feb 2010; Markus Duft <mduft@gentoo.org> cvs-1.11.22.1-r1.ebuild:
   Added necessary build-bits for interix/prefix.
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 026e0624aed4..87ca248e5c77 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -1,12 +1,16 @@
+AUX cvs-1.11.22.1-hash-nameclash.patch 974 RMD160 c2eb8eaa3cd17273b1b49eb30e33c6afd31f0677 SHA1 f4880b1c7b13533061d2250465226ca70c032ee0 SHA256 2334f94d64e1565535818d6b41c079540acaf19b2320ba06275d78cf5b3e6d43
 AUX cvs-1.12.12-block-requests.patch 4006 RMD160 47be05434e53c25fc6dd1fa6848d25d155dc307a SHA1 a4e77d76457a3047c19945d53f3b2aca572d1da4 SHA256 70bbf745815d1e01582329160a10f5cdd9c11051e4e62d331686dd5124e01294
 AUX cvs-1.12.12-cvs-custom.c 1735 RMD160 c4c1dea5b3656061a2eb0678acaa95c1b58b2e87 SHA1 409184599eb9b311a91066d75b2833ee455bbd4d SHA256 bd288a9484c4c26569a44e71f0935cf310e4b02e25e7e9ba564c9fc3f5121054
 AUX cvs-1.12.12-cvs-gnulib-vasnprintf.patch 1092 RMD160 1ec01dbfca6cbc8b933f1331b1e020430494273d SHA1 9edfd35bff01a05a9b1936f33f4645a57fb818d7 SHA256 f38e6bbb0fd8b783b654ac775183a1cb24e3987698fdbd706a8d5fa59a45f945
 AUX cvs-1.12.12-cvsbug-tmpfix.patch 624 RMD160 c580f653ef9f294676aa4d766decaac50298b3c5 SHA1 bb00a168e604940bdbc38baf10f0a8c1e3f5d862 SHA256 061c26d140e1195200f1cc76217b2e7c2ff7f0c4dcbbb31124b386e8e756938e
+AUX cvs-1.12.12-hash-nameclash.patch 1015 RMD160 616f50fc9e7faa7c0b2ac34f5d526b40db433517 SHA1 43675b3334a7343db2fd213c9c1f1673f9e193c4 SHA256 3a6a5bf6bd419bb8a4440f3f4f5dba770db1d06e33e0ab6d249ace490010edb4
 AUX cvs-1.12.12-install-sh.patch 495 RMD160 f5ada20250b2dea6979feb609077f57462aa0a21 SHA1 a6201f8d4f2343fe20214d0862fe0e710b61a4af SHA256 9c2fc03b42804f8edb3a5a6f9c9e80bd68924f265ce52d196c3b5c759ba42f8a
 AUX cvs-1.12.12-openat.patch 761 RMD160 05cfb679777b001633ace65e76f9a7a3d397a71a SHA1 23a3941ce449fb105c7b8cce1147a5d525a7753e SHA256 5b9fc46c2ee46d9136ddfc8d0baaac6087d8cae40fa5521815c3c2e372f25b9f
 AUX cvs-1.12.13-openat.patch 761 RMD160 060652b7ef0e43f8dcdb84f11f4e51fbefff2549 SHA1 96bcc6b44a89475cb97d65707056c797115cc88a SHA256 9edfd8671fce137462c4fb22366f4c6f8fec04b7073e3c3b8381e5b0211ab4b8
 AUX cvs-1.12.13-zlib.patch 1304 RMD160 2fba6c94b68a331b621e457f54826af98cf70958 SHA1 b5b44a1166ece7be9ca14a661f75544638a96b4e SHA256 07b3e411282ee8f218447bc862144a67144df71beaa842761012899ff5452f19
 AUX cvs-1.12.13.1-block-requests.patch 2869 RMD160 eb29149d89845c8e523725b421323e21b364dabe SHA1 36bf47339d391a3d75e86f34e464daab35c79cc8 SHA256 0aaba805beb3f5a9271f907ae0e5933b110156fbcca15f843a07a1bf4c72a7f3
+AUX cvs-1.12.13.1-gl-mempcpy.patch 902 RMD160 fa2236cd81a787c4ed856fe5f30f408e9b18af71 SHA1 c17617ffdb1291027d0fe761fa9115acfe279b51 SHA256 9aa20504eaa38bea9933a14115fd0d7f84b84884e5f9d2f521a219d6fafdcb8a
+AUX cvs-1.12.13.1-hash-nameclash.patch 1056 RMD160 b5b8ecbb11841fd9eea1802e0ba5e4557eb22627 SHA1 d9ed7325986618082d791053fff9f90b3758cfd6 SHA256 4faeef2d4169799dad63a934f26d90ae9d6d47d1d88d37b0c4b39423b46ce40f
 AUX cvs.pam-include-1.12.12 106 RMD160 8c056262a6cf2b9f94c1762c7cebed02e72ef722 SHA1 2fa6dca77ebab74d519e1373e5c5ea14283ba0ea SHA256 8291f84c2d76269e7be6487ae1db7212e67ee7313d35e6b0cebcd01e30d155af
 AUX cvspserver.xinetd.d 282 RMD160 83fe38b4f55eaf7784d1672c73415410b389479b SHA1 4f29028cd8b41d5934b59e7f41e7c3b385b83d54 SHA256 71b62c4f278ed17bf3cac8eacb2bfb17b6125bfe77f83b46fa5742395b74ef5f
 DIST cederqvist-1.11.20.html.tar.bz2 115711 RMD160 0d44ef453f1f98ee7fe006a0d60e0eba92c58598 SHA1 cfc8b233b076b8d9e147b8a890b87e8cd7e3c941 SHA256 2f11179ab25976142b622300a93274df96e6145cd3da7be964a1de33d54f4810
@@ -33,15 +37,15 @@ DIST cvs-1.12.13.tar.bz2 3911104 RMD160 ba3048e3e2d99ae78f6a759889b615acf65dd487
 EBUILD cvs-1.11.20.ebuild 1530 RMD160 7bbbfe753ef2ab8aedc6e012cd02616c1bb34897 SHA1 cc2f3a068ebcfbb955cc5e3d5ed6348670b62e1d SHA256 a8d922582a5b97363f093a1652cee59efbccc113968c88608b6f85ee052479f4
 EBUILD cvs-1.11.21-r1.ebuild 1694 RMD160 f8a4cb0c0dd5762435a307b8fe77c4df35bb69a9 SHA1 c7a5979c33cbe42e94ade1e81cb535b03d07979b SHA256 cbfb55efcb74a114b6d15519eced7c960ae9b1fd07e6abf95d5490f9499ca100
 EBUILD cvs-1.11.21.ebuild 1533 RMD160 c3a77c54fd462780ec7bdbc66db05a9dc3f80b2a SHA1 189002d08154b4a649e29e4bcc55c1668c60e113 SHA256 eb57c9bce8fa710b112a9c5e8c2a18c358eabf06c7c95c9b471c903f691d76cf
-EBUILD cvs-1.11.22.1-r1.ebuild 1952 RMD160 416b049261590f13323ff1b24ed74a883da6cb2d SHA1 d050d55a28911cb53f88eb789aaa82f26e9080df SHA256 da7794ad1ff6a1701d7d4e79464985b60f039d5a9907f0080b790459390d55e5
+EBUILD cvs-1.11.22.1-r1.ebuild 2045 RMD160 dc3899c4cb98a30fe6ddb31467c7fd5df4f2c00b SHA1 df889ff4921bc1d3de56051c8f69a406042f0579 SHA256 0763df89a2bc48e1c207144b97716fb348ebd7ca4a582fc02ea0801fa4fc4cb3
 EBUILD cvs-1.11.22.1.ebuild 1724 RMD160 edc7a2033f772a41e87807c670c82cae7cc140f2 SHA1 de38d3a2fabe8f990ca18f35891c2f25cce07c6e SHA256 6525e4f33c6f227694468f723274a6fe6adc0222c3e3c034b309a23a85b3d9b3
 EBUILD cvs-1.12.12-r2.ebuild 1957 RMD160 651ac5b15443522e7d7ec40abc895def46ba5cb1 SHA1 b83794f632313eeb19efb802e52310303e3846b6 SHA256 68fece868a8e5b4d6cd40b9b9cef9d094d30e3a43550048b4800869b2fc9951d
 EBUILD cvs-1.12.12-r3.ebuild 2083 RMD160 fa07d30926b1988612357c5b21e4fc4fa7e603d8 SHA1 a04253c163b1335553e22fb91adbfa09542d5fd7 SHA256 f2ec676a6553cf75c99bc6c8bc7fa01b8471ef0c0ca3ddb8e6c7fa647fd829be
 EBUILD cvs-1.12.12-r4.ebuild 2390 RMD160 8cf24960136d2aac5b36abccc887ca63f7b05d56 SHA1 9ec607fdc5bc8156d96e036f76d192700b113756 SHA256 dcd0d28d66aa4218cee6d65554f97e8bb7aac214683cd5de91ee0af3d07b2f6a
 EBUILD cvs-1.12.12-r5.ebuild 2422 RMD160 06ea1afa9a4de041d5f11ed5390a1bf8f9d97c98 SHA1 17d8b3c3787a447e2a4a9a52917c3cfea40f2105 SHA256 0c73cede054615273de7c243273bffb6be6bdba51f0290f82564c1aacd7632e6
 EBUILD cvs-1.12.12-r6.ebuild 2464 RMD160 5c11d1fc110086def5eba42d8cd67ce6eed2e84c SHA1 3fbe0e6644ce71fb04b6fea0c5a2ef60fd9ed21f SHA256 da5ea464d88243146bcf17dba48f92f608b361db73ec21d74b56c8bc8ad45fe4
-EBUILD cvs-1.12.12-r7.ebuild 2512 RMD160 caba581c87cc99852007d36d71dc6d8327274065 SHA1 ee5edf971e91a6327f7de9dae9e96ccdc6c2eae3 SHA256 16730d913c09d2d63343bf304e80a95c61ca556f6765b3bed6948bb47ddc8a6e
+EBUILD cvs-1.12.12-r7.ebuild 2571 RMD160 043f4316718c18da28236d0848cc85272b511216 SHA1 a532121d9624a7af3240d0e377b1e110ed6d3cb1 SHA256 5c38002864c77a38e0f8076c2487f7a76d6912354062ec2f7c41961c46863624
 EBUILD cvs-1.12.13-r1.ebuild 4003 RMD160 5e2bf9ff59a53be71ea3ce5f67a1d0601313883b SHA1 42a49a2ca0eddb66dd6f80e2b3de61fdddd957d9 SHA256 5fb15273826e7a9a320eefbcc7e8e70d5ca712e11987d6332a2b1cd1eb397d64
-EBUILD cvs-1.12.13.1.ebuild 4630 RMD160 f7cb830193fa9e4aa9c3020ccee5fc7c2efbbb6e SHA1 3b0581dc8f547762bd88c518883cc6fdef6b35bf SHA256 a896eaf50b85aa3220773680e9a70b2e567fb2a9fc25673e31c81658f9949cb7
-MISC ChangeLog 18976 RMD160 6c2fa185ed4d1be55cd1d5e12916f98377c3a995 SHA1 67994b0fb4bd66c3c033592ff8321b849ef0639f SHA256 ce36b5f0c7827285c5990f82e46306887d8a0cfbada6241691dead44d5b11b3b
+EBUILD cvs-1.12.13.1.ebuild 4765 RMD160 61692e3e7330be057ec48302eaa91dfd06e9320c SHA1 62389cd67132892b2dd6de97362db647dfcb9f05 SHA256 85f4cdbd19d4e6f109f3dcd26294cdbd84a3ecf8c6979101a3feb288e6d7568d
+MISC ChangeLog 19321 RMD160 c3a0a5cfaf766fcdea6ab568d579791ad632ffbd SHA1 7956cacc1c65637b611acfef4b18ce4b113236a7 SHA256 43592b24301898314f68b11b74b4202c6778e9157c08eb15374a62182abe3a4e
 MISC metadata.xml 234 RMD160 e17a8f89518ebdd332c220104e56f649096be1da SHA1 472e62beb27cdd753a0454194630c916f0600e0b SHA256 ce7beba20d6099be006550fb74bb9e74628a9d6967c7ceb096ab99959df47a02
diff --git a/dev-util/cvs/cvs-1.11.22.1-r1.ebuild b/dev-util/cvs/cvs-1.11.22.1-r1.ebuild
index 86dddce4bd52..d7f5db6c475c 100644
--- a/dev-util/cvs/cvs-1.11.22.1-r1.ebuild
+++ b/dev-util/cvs/cvs-1.11.22.1-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.22.1-r1.ebuild,v 1.3 2010/02/25 08:16:36 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.22.1-r1.ebuild,v 1.4 2010/03/11 10:32:40 haubi Exp $
 
 EAPI=3
 
+inherit eutils
+
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.cvshome.org/"
 SRC_URI="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/${P}.tar.bz2
@@ -25,6 +27,10 @@ src_unpack() {
 	find "${S}" -type f -name getdate -exec rm \{\} \;
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+}
+
 src_configure() {
 	[[ ${CHOST} == *-interix* ]] && export ac_cv_header_inttypes_h=no
 
diff --git a/dev-util/cvs/cvs-1.12.12-r7.ebuild b/dev-util/cvs/cvs-1.12.12-r7.ebuild
index add52a4171b8..02e35f2e0aee 100644
--- a/dev-util/cvs/cvs-1.12.12-r7.ebuild
+++ b/dev-util/cvs/cvs-1.12.12-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r7.ebuild,v 1.1 2010/02/21 03:06:44 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r7.ebuild,v 1.2 2010/03/11 10:32:40 haubi Exp $
 
 EAPI=3
 
@@ -35,6 +35,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-block-requests.patch
 	epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
 	epatch "${FILESDIR}"/${P}-install-sh.patch
+	epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
 	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
 }
 
diff --git a/dev-util/cvs/cvs-1.12.13.1.ebuild b/dev-util/cvs/cvs-1.12.13.1.ebuild
index 00644ff6f07a..50777c2e4195 100644
--- a/dev-util/cvs/cvs-1.12.13.1.ebuild
+++ b/dev-util/cvs/cvs-1.12.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13.1.ebuild,v 1.6 2010/02/21 03:06:44 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13.1.ebuild,v 1.7 2010/03/11 10:32:40 haubi Exp $
 
 EAPI=3
 
@@ -41,6 +41,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
 	epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
 	epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
+	epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
+	epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
 	# Applied by upstream:
 	#epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
 	#epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
diff --git a/dev-util/cvs/files/cvs-1.11.22.1-hash-nameclash.patch b/dev-util/cvs/files/cvs-1.11.22.1-hash-nameclash.patch
new file mode 100644
index 000000000000..e6be37cadf94
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.11.22.1-hash-nameclash.patch
@@ -0,0 +1,41 @@
+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
+
+--- src/hash.h.orig	2010-03-10 18:47:20 +0100
++++ src/hash.h	2010-03-10 18:47:40 +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) ();
+ };
+-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 PROTO((void));
+ Node *findnode PROTO((List * list, const char *key));
diff --git a/dev-util/cvs/files/cvs-1.12.12-hash-nameclash.patch b/dev-util/cvs/files/cvs-1.12.12-hash-nameclash.patch
new file mode 100644
index 000000000000..0a33eea873ff
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.12-hash-nameclash.patch
@@ -0,0 +1,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
+
+--- src/hash.h.orig	2005-02-01 22:56:48 +0100
++++ 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);
diff --git a/dev-util/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch b/dev-util/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch
new file mode 100644
index 000000000000..7ad7533b0a57
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch
@@ -0,0 +1,24 @@
+http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/lib/mempcpy.c?r1=1.2&r2=1.3&pathrev=MAIN
+fixed in cvs-HEAD after cvs-1.12.13a
+
+--- lib/mempcpy.c	2005/05/23 17:44:31	1.2
++++ lib/mempcpy.c	2007/08/22 12:48:42	1.3
+@@ -1,5 +1,5 @@
+ /* Copy memory area and return pointer after last written byte.
+-   Copyright (C) 2003 Free Software Foundation, Inc.
++   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -15,9 +15,9 @@
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+ 
+-/* Specification.  */
+-#include "mempcpy.h"
++#include <config.h>
+ 
++/* Specification.  */
+ #include <string.h>
+ 
+ /* Copy N bytes of SRC to DEST, return pointer to bytes after the
diff --git a/dev-util/cvs/files/cvs-1.12.13.1-hash-nameclash.patch b/dev-util/cvs/files/cvs-1.12.13.1-hash-nameclash.patch
new file mode 100644
index 000000000000..d9c3358faf46
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.13.1-hash-nameclash.patch
@@ -0,0 +1,43 @@
+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
+
+--- src/hash.h.orig	2010-03-11 10:12:19 +0100
++++ src/hash.h	2010-03-11 10:12:40 +0100
+@@ -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 *);
++    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);