From d244d8703e3d0edbd492dca367d74db166e8a687 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Sun, 18 Apr 1993 20:50:22 +0000
Subject: Cleanup for GCC 2.

---
 arithmetic/arithmetic.c |  2 +-
 cribbage/crib.c         |  5 ++++-
 cribbage/io.c           | 14 ++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/arithmetic/arithmetic.c b/arithmetic/arithmetic.c
index 4fd8bf96..aa342de1 100644
--- a/arithmetic/arithmetic.c
+++ b/arithmetic/arithmetic.c
@@ -77,6 +77,7 @@ static char sccsid[] = "@(#)arithmetic.c	5.5 (Berkeley) 2/27/91";
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
 char keylist[] = "+-x/";
 char defaultkeys[] = "+-";
@@ -102,7 +103,6 @@ main(argc, argv)
 	extern char *optarg;
 	extern int optind;
 	int ch, cnt;
-	time_t time();
 	void intr();
 
 	while ((ch = getopt(argc, argv, "r:o:")) != EOF)
diff --git a/cribbage/crib.c b/cribbage/crib.c
index d1d8bc74..f3146571 100644
--- a/cribbage/crib.c
+++ b/cribbage/crib.c
@@ -43,6 +43,7 @@ static char sccsid[] = "@(#)crib.c	5.6 (Berkeley) 2/28/91";
 
 # include	<sys/signal.h>
 # include	<curses.h>
+# include	<unistd.h>
 # include	"deck.h"
 # include	"cribbage.h"
 # include	"cribcur.h"
@@ -60,7 +61,7 @@ char	*argv[];
 	char			*s;		/* for reading arguments */
 	FILE			*f;
 	FILE			*fopen();
-	char			*getline(), *getlogin();
+	char			*getline();
 	void			rint();
 
 	while ((ch = getopt(argc, argv, "eqr")) != EOF)
@@ -179,6 +180,7 @@ game()
 	register int		i, j;
 	BOOLEAN			flag;
 	BOOLEAN			compcrib;
+	char			*getline();
 
 	makeboard();
 	refresh();
@@ -356,6 +358,7 @@ int		pos;
 {
 	register int		i, cardx;
 	BOOLEAN			win = FALSE;
+	char			*getline();
 
 	if (mycrib) {
 	    if (!rflag) {			/* random cut */
diff --git a/cribbage/io.c b/cribbage/io.c
index ef99246b..0d795168 100644
--- a/cribbage/io.c
+++ b/cribbage/io.c
@@ -374,14 +374,11 @@ int		Mpos = 0;
 static int	Newpos = 0;
 
 /* VARARGS1 */
-msg(fmt)
+msg(fmt,ap)
 	char *fmt;
+	_VA_LIST_ ap;
 {
-	va_list ap;
-
-	va_start(ap, fmt);
 	(void)vsprintf(&Msgbuf[Newpos], fmt, ap);
-	va_end(ap);
 	endmsg();
 }
 
@@ -390,14 +387,11 @@ msg(fmt)
  *	Add things to the current message
  */
 /* VARARGS1 */
-addmsg(fmt)
+addmsg(fmt,ap)
 	char *fmt;
+	_VA_LIST_ ap;
 {
-	va_list ap;
-
-	va_start(ap, fmt);
 	(void)vsprintf(&Msgbuf[Newpos], fmt, ap);
-	va_end(ap);
 }
 
 /*
-- 
cgit v1.2.3-56-ge451