Fix broken build with gcc 4.5.

6 files changed, 81 insertions, 1 deletions

diff --git a/net/delegate/distinfo b/net/delegate/distinfo
index ee52ccbcdaf..e4a8c0390e6 100644
--- a/net/delegate/distinfo
+++ b/net/delegate/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.12 2009/02/24 03:24:15 rh Exp $
+$NetBSD: distinfo,v 1.13 2012/06/30 07:05:08 dholland Exp $
 
 SHA1 (delegate9.9.1.tar.gz) = 828615b83b22fb36925d065239de61492a937e8f
 RMD160 (delegate9.9.1.tar.gz) = a8a114fd310e3e25e2e234574d7c8ff1e5d0c1d7
 Size (delegate9.9.1.tar.gz) = 1944670 bytes
+SHA1 (patch-rary_pstitle_c) = 3b30e698749b5ed6a9cc197b0ab6a1e013de2673
+SHA1 (patch-resolvy_resconf_c) = d090d26542a3197fb48514652f3b421b6282a6cc
+SHA1 (patch-resolvy_resolv_c) = d903447c60f1c79b7bc596cba9d3c8070298a1e2
+SHA1 (patch-src_delegated_c) = d0355e6c7c700e9c0fc894fec3eb403f626a1758
+SHA1 (patch-src_inets_c) = 3664facb1bfaa88a76fc74186bae45184b41115c
diff --git a/net/delegate/patches/patch-rary_pstitle_c b/net/delegate/patches/patch-rary_pstitle_c
new file mode 100644
index 00000000000..0e0d4b5d201
--- /dev/null
+++ b/net/delegate/patches/patch-rary_pstitle_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-rary_pstitle_c,v 1.1 2012/06/30 07:05:08 dholland Exp $
+
+Fix build with gcc 4.5.
+
+--- rary/pstitle.c~	2008-12-23 20:55:11.000000000 +0000
++++ rary/pstitle.c
+@@ -25,7 +25,7 @@ int IsBOW1_5();
+ int FS_maybeUnix();
+ 
+ int PSTITLE_DISABLE;
+-struct { defQStr(p); } pstitle_area;
++struct pstitle_thingy { defQStr(p); } pstitle_area;
+ int   pstitle_size;
+ int   pstitle_leng;
+ int   pstitle_lengmax = 2048;
diff --git a/net/delegate/patches/patch-resolvy_resconf_c b/net/delegate/patches/patch-resolvy_resconf_c
new file mode 100644
index 00000000000..cee6c832913
--- /dev/null
+++ b/net/delegate/patches/patch-resolvy_resconf_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-resolvy_resconf_c,v 1.1 2012/06/30 07:05:08 dholland Exp $
+
+Fix build with gcc 4.5.
+
+--- resolvy/resconf.c~	2008-12-25 04:04:51.000000000 +0000
++++ resolvy/resconf.c
+@@ -109,7 +109,7 @@ static ResolvyEnv *resolvyEnv;
+ #define lastRRX		RE.re_lastRRX
+ #define F_aton		RE.re_F_aton
+ #define confpath	RE.re_confpath
+-struct { defQStr(resolv_errmsg); } resolv_errmsg;
++struct resolve_thingy { defQStr(resolv_errmsg); } resolv_errmsg;
+ #define ns_stop		RE.re_ns_stop
+ 
+ #ifndef RSLV_CONF
diff --git a/net/delegate/patches/patch-resolvy_resolv_c b/net/delegate/patches/patch-resolvy_resolv_c
new file mode 100644
index 00000000000..22a9dd33c1c
--- /dev/null
+++ b/net/delegate/patches/patch-resolvy_resolv_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-resolvy_resolv_c,v 1.1 2012/06/30 07:05:09 dholland Exp $
+
+Fix build with gcc 4.5.
+
+--- resolvy/resolv.c~	2008-08-26 20:20:40.000000000 +0000
++++ resolvy/resolv.c
+@@ -781,7 +781,7 @@ static int getns(int nid,int nsc,VSAddr 
+ 	return nsx;
+ }
+ 
+-extern struct { defQStr(resolv_errmsg); } resolv_errmsg;
++extern struct resolv_thingy { defQStr(resolv_errmsg); } resolv_errmsg;
+ static int dumpResponse(int qidbase,PVStr(resp),int rc,Header *hp,PCStr(addr))
+ {	const char *mp;
+ 	CStr(qname,1024);
diff --git a/net/delegate/patches/patch-src_delegated_c b/net/delegate/patches/patch-src_delegated_c
new file mode 100644
index 00000000000..994272b6b56
--- /dev/null
+++ b/net/delegate/patches/patch-src_delegated_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_delegated_c,v 1.1 2012/06/30 07:05:09 dholland Exp $
+
+Fix build with gcc 4.5.
+
+--- src/delegated.c~	2009-01-10 09:28:09.000000000 +0000
++++ src/delegated.c
+@@ -9917,7 +9917,7 @@ void mainProcTitle(Connection *Conn)
+ }
+ 
+ #define PSTITLE_END "--"
+-extern struct { defQStr(p); } pstitle_area;
++extern struct pstitle_thingy { defQStr(p); } pstitle_area;
+ extern int   pstitle_size;
+ extern int   pstitle_lengmax;
+ extern int   pstitle_leng; /* length of original arguments */
diff --git a/net/delegate/patches/patch-src_inets_c b/net/delegate/patches/patch-src_inets_c
new file mode 100644
index 00000000000..edb5e46c189
--- /dev/null
+++ b/net/delegate/patches/patch-src_inets_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_inets_c,v 1.1 2012/06/30 07:05:09 dholland Exp $
+
+Fix build with gcc 4.5.
+
+--- src/inets.c~	2009-01-13 04:44:08.000000000 +0000
++++ src/inets.c
+@@ -183,7 +183,7 @@ int addrIsWildcard(PCStr(addr)){
+ 
+ #define RESOLVERS_SIZ	512
+ 
+-extern struct { defQStr(resolv_errmsg); } resolv_errmsg;
++extern struct resolv_thingy { defQStr(resolv_errmsg); } resolv_errmsg;
+ 
+ int CTX_defSockOpts(DGC*,PCStr(name),PCStr(spec),int neg);
+ static scanListFunc conf1(PCStr(conf))