Fix merge conflicts

[bsdgames-darwin.git] / larn / diag.c

diff --git a/larn/diag.c b/larn/diag.c
index 4f8ea899a0124e49013f4d7d305309259b23907b..0f00a6f1677c8bb5a2dac1afdf415d6f5e8ad9dc 100644 (file)
--- a/larn/diag.c
+++ b/larn/diag.c
@@ -1,9 +1,9 @@
-/*     $NetBSD: diag.c,v 1.11 2008/01/28 05:38:53 dholland Exp $       */
+/*     $NetBSD: diag.c,v 1.13 2012/06/19 05:30:43 dholland Exp $       */
 
 /* diag.c              Larn is copyrighted 1986 by Noah Morgan. */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: diag.c,v 1.11 2008/01/28 05:38:53 dholland Exp $");
+__RCSID("$NetBSD: diag.c,v 1.13 2012/06/19 05:30:43 dholland Exp $");
 #endif                         /* not lint */
 
 #include <sys/types.h>
@@ -14,7 +14,14 @@ __RCSID("$NetBSD: diag.c,v 1.11 2008/01/28 05:38:53 dholland Exp $");
 #include <unistd.h>
 #include "header.h"
 #include "extern.h"
+
+static void greedy(void);
+static void fsorry(void);
+static void fcheat(void);
+
 static struct tms cputime;
+time_t time(time_t *t);
+
 /*
        ***************************
        DIAG -- dungeon diagnostics
@@ -170,8 +177,7 @@ diagdrawscreen()
  */
 static time_t   zzz = 0;
 int
-savegame(fname)
-       char *fname;
+savegame(char *fname)
 {
        int    i, k;
        struct sphere *sp;
@@ -236,8 +242,7 @@ savegame(fname)
 }
 
 void
-restoregame(fname)
-       char           *fname;
+restoregame(char *fname)
 {
        int    i, k;
        struct sphere *sp, *sp2;
@@ -353,8 +358,8 @@ restoregame(fname)
 /*
        subroutine to not allow greedy cheaters
  */
-void
-greedy()
+static void
+greedy(void)
 {
 #if WIZID
        if (wizard)
@@ -375,8 +380,8 @@ greedy()
        subroutine to not allow altered save files and terminate the attempted
        restart
  */
-void
-fsorry()
+static void
+fsorry(void)
 {
        lprcat("\nSorry, but your savefile has been altered.\n");
        lprcat("However, seeing as I am a good sport, I will let you play.\n");
@@ -388,8 +393,8 @@ fsorry()
 /*
        subroutine to not allow game if save file can't be deleted
  */
-void
-fcheat()
+static void
+fcheat(void)
 {
 #if WIZID
        if (wizard)