Don't use "restrict" as an identifier; it's a keyword nowadays.

Fixes clang build.

3 files changed, 50 insertions, 2 deletions

diff --git a/chat/i2cb/patches/patch-ac b/chat/i2cb/patches/patch-ac
index 59d43ab2673..f79b57d710a 100644
--- a/chat/i2cb/patches/patch-ac
+++ b/chat/i2cb/patches/patch-ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2010/03/04 21:40:29 spz Exp $
+$NetBSD: patch-ac,v 1.5 2012/12/24 03:11:25 dholland Exp $
+
+- don't use "restrict" as an identifier, it's a keyword now
+- ...? (XXX)
 
 --- src/externs.h.orig	2000-03-15 22:28:13.000000000 +0000
 +++ src/externs.h
@@ -37,3 +40,12 @@ $NetBSD: patch-ac,v 1.4 2010/03/04 21:40:29 spz Exp $
  char	*getloginid (void);
  char	*getswitch (int argc, char **argv, char **switchv);
  void	getterm (void);
+@@ -115,7 +118,7 @@ void	quoteify (char *a, char *b);
+ void	readlineinit (void);
+ void	regnick (char *password);
+ void	restoreterm (void);
+-void	restrict (void);
++void	setrestricted (void);
+ int	s_admin (TARGLIST);
+ int	s_beep (TARGLIST);
+ int	s_bump (TARGLIST);
diff --git a/chat/i2cb/patches/patch-as b/chat/i2cb/patches/patch-as
index ba0aa20aa65..26f485c36b0 100644
--- a/chat/i2cb/patches/patch-as
+++ b/chat/i2cb/patches/patch-as
@@ -1,4 +1,7 @@
-$NetBSD: patch-as,v 1.2 2005/12/13 21:30:11 joerg Exp $
+$NetBSD: patch-as,v 1.3 2012/12/24 03:11:25 dholland Exp $
+
+- don't use "restrict" as an identifier, it's a keyword now
+- ...? (XXX)
 
 --- src/main.c.orig	2000-03-15 22:13:28.000000000 +0000
 +++ src/main.c
@@ -66,6 +69,15 @@ $NetBSD: patch-as,v 1.2 2005/12/13 21:30:11 joerg Exp $
  			break;
  
  		case 'p':
+@@ -228,7 +242,7 @@ main (int argc, char **argv)
+ 		tclinit();
+ 		readlineinit();
+ 		if (restrictflg && !gv.restricted)
+-			restrict();
++			setrestricted();
+ 	}
+ 
+ 	/* try to connect to port - if it fails, start server if we are on */
 @@ -261,14 +275,14 @@ main (int argc, char **argv)
  		myport = serverdata->port;
  	}
diff --git a/chat/i2cb/patches/patch-src_oset.c b/chat/i2cb/patches/patch-src_oset.c
new file mode 100644
index 00000000000..f42c155d044
--- /dev/null
+++ b/chat/i2cb/patches/patch-src_oset.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_oset.c,v 1.1 2012/12/24 03:11:25 dholland Exp $
+
+- don't use "restrict" as an identifier, it's a keyword now
+
+--- src/oset.c~	2000-03-15 22:30:16.000000000 +0000
++++ src/oset.c
+@@ -12,7 +12,7 @@
+ 
+ int	oset (TARGLIST);
+ int	ounset (TARGLIST);
+-void	restrict (void);
++void	setrestricted (void);
+ static int	setvar (Tcl_Interp *interp, int type, char *address, char *s);
+ static int	unsetvar (Tcl_Interp *interp, int type, char *address);
+ static int	listvars (char *name);
+@@ -310,7 +310,7 @@ varsanity (void)
+ }
+ 
+ void
+-restrict (void)
++setrestricted (void)
+ {
+ 	gv.restricted = 1;
+ }