Fix merge conflicts

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

diff --git a/larn/diag.c b/larn/diag.c
index a3482c1d2dd579875827446cf4625f00422c46b4..0f00a6f1677c8bb5a2dac1afdf415d6f5e8ad9dc 100644 (file)
--- a/larn/diag.c
+++ b/larn/diag.c
@@ -20,6 +20,7 @@ static void fsorry(void);
 static void fcheat(void);
 
 static struct tms cputime;
+time_t time(time_t *t);
 
 /*
        ***************************