Rename use of some builtins that makes gcc4 warn.

ok millert

6 files changed, 12 insertions, 12 deletions

diff --git a/games/cribbage/crib.c b/games/cribbage/crib.c
index b685d0e99ed..efbd71d20dd 100644
--- a/games/cribbage/crib.c
+++ b/games/cribbage/crib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crib.c,v 1.14 2009/10/27 23:59:24 deraadt Exp $	*/
+/*	$OpenBSD: crib.c,v 1.15 2010/05/10 08:53:12 nicm Exp $	*/
 /*	$NetBSD: crib.c,v 1.7 1997/07/10 06:47:29 mikel Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@ main(int argc, char *argv[])
 		}
 
 	initscr();
-	(void)signal(SIGINT, rint);
+	(void)signal(SIGINT, rintsig);
 	cbreak();
 	noecho();
 
diff --git a/games/cribbage/cribbage.h b/games/cribbage/cribbage.h
index ec62a409afd..08002905462 100644
--- a/games/cribbage/cribbage.h
+++ b/games/cribbage/cribbage.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cribbage.h,v 1.8 2004/07/10 07:26:23 deraadt Exp $	*/
+/*	$OpenBSD: cribbage.h,v 1.9 2010/05/10 08:53:12 nicm Exp $	*/
 /*	$NetBSD: cribbage.h,v 1.3 1995/03/21 15:08:46 cgd Exp $	*/
 
 /*
@@ -104,7 +104,7 @@ void	 printcard(WINDOW *, int, CARD, bool);
 void	 prpeg(int, int, bool);
 void	 prtable(int);
 int	 readchar(void);
-void	 rint(int);
+void	 rintsig(int);
 int	 score(bool);
 int	 scorehand(CARD [], CARD, int, bool, bool);
 void	 shuffle(CARD []);
diff --git a/games/cribbage/io.c b/games/cribbage/io.c
index 32d61613a2c..b335f9707b2 100644
--- a/games/cribbage/io.c
+++ b/games/cribbage/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.12 2009/10/27 23:59:24 deraadt Exp $	*/
+/*	$OpenBSD: io.c,v 1.13 2010/05/10 08:53:12 nicm Exp $	*/
 /*	$NetBSD: io.c,v 1.9 1997/07/09 06:25:47 phil Exp $	*/
 
 /*-
@@ -559,7 +559,7 @@ getline(void)
 }
 
 void
-rint(int signo)
+rintsig(int signo)
 {
 	bye();
 	exit(1);
diff --git a/games/monop/misc.c b/games/monop/misc.c
index 1fc01e0ec19..67c5094bfef 100644
--- a/games/monop/misc.c
+++ b/games/monop/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.10 2009/10/27 23:59:26 deraadt Exp $	*/
+/*	$OpenBSD: misc.c,v 1.11 2010/05/10 08:53:12 nicm Exp $	*/
 /*	$NetBSD: misc.c,v 1.4 1995/03/23 08:34:47 cgd Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ getyn(prompt)
 	int	com;
 
 	for (;;)
-		if ((com=getinp(prompt, yn)) < 2)
+		if ((com=getinp(prompt, ynlist)) < 2)
 			return com;
 		else
 			(*func[com-2])();
diff --git a/games/monop/monop.def b/games/monop/monop.def
index 52d1f206637..881958fa9c6 100644
--- a/games/monop/monop.def
+++ b/games/monop/monop.def
@@ -1,4 +1,4 @@
-/*	$OpenBSD: monop.def,v 1.5 2003/06/03 03:01:40 millert Exp $	*/
+/*	$OpenBSD: monop.def,v 1.6 2010/05/10 08:53:12 nicm Exp $	*/
 /*	$NetBSD: monop.def,v 1.3 1995/03/23 08:34:54 cgd Exp $	*/
 
 /*-
@@ -53,7 +53,7 @@ char	*name_list[MAX_PL+2],	/* list of players' names		*/
 	"",		/* 16 */
 	0
 	},
-	*yn[]		= {	/* list of commands for yes/no answers	*/
+	*ynlist[]	= {	/* list of commands for yes/no answers	*/
 	"yes",		/*  0 */	"no",		/*  1 */
 	"quit",		/*  2 */	"print",	/*  3 */
 	"where",	/*  4 */	"own holdings",	/*  5 */
diff --git a/games/monop/monop.ext b/games/monop/monop.ext
index fb7d4e32010..e8cb3edabf2 100644
--- a/games/monop/monop.ext
+++ b/games/monop/monop.ext
@@ -1,4 +1,4 @@
-/*	$OpenBSD: monop.ext,v 1.3 2003/06/03 03:01:40 millert Exp $	*/
+/*	$OpenBSD: monop.ext,v 1.4 2010/05/10 08:53:12 nicm Exp $	*/
 /*	$NetBSD: monop.ext,v 1.2 1995/03/23 08:34:58 cgd Exp $	*/
 
 /*-
@@ -37,7 +37,7 @@
 
 extern bool	trading, spec, fixing, told_em;
 
-extern char	*yn[], *comlist[], *name_list[], *lucky_mes[];
+extern char	*ynlist[], *comlist[], *name_list[], *lucky_mes[];
 
 extern int	num_play, player, num_doub, num_luck, (*func[])();