Fix merge conflicts

[bsdgames-darwin.git] / mille / mille.c

diff --git a/mille/mille.c b/mille/mille.c
index 9b269c29efb3e04976246512afa2ebe691ba1fd6..10857a8da804f2d2dfa05fa6bba085b58d616d59 100644 (file)
--- a/mille/mille.c
+++ b/mille/mille.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: mille.c,v 1.18 2009/05/25 23:34:50 dholland Exp $      */
+/*     $NetBSD: mille.c,v 1.20 2011/08/31 16:24:56 plunky Exp $        */
 
 /*
  * Copyright (c) 1982, 1993
@@ -39,10 +39,11 @@ __COPYRIGHT("@(#) Copyright (c) 1982, 1993\
 #if 0
 static char sccsid[] = "@(#)mille.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: mille.c,v 1.18 2009/05/25 23:34:50 dholland Exp $");
+__RCSID("$NetBSD: mille.c,v 1.20 2011/08/31 16:24:56 plunky Exp $");
 #endif
 #endif /* not lint */
 
+#include <time.h>
 #include "mille.h"
 #include <signal.h>
 
@@ -60,7 +61,7 @@ main(int ac, char *av[])
 
        if (strcmp(av[0], "a.out") == 0) {
                outf = fopen("q", "w");
-               setbuf(outf, (char *)NULL);
+               setbuf(outf, NULL);
                Debug = TRUE;
        }
        restore = FALSE;
@@ -91,7 +92,7 @@ main(int ac, char *av[])
        leaveok(Miles, TRUE);
        clearok(curscr, TRUE);
 #ifndef PROF
-       srandom(getpid());
+       srandom((long) time(NULL));
 #else
        srandom(0);
 #endif