Fix merge conflicts

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

diff --git a/mille/init.c b/mille/init.c
index 99d7a55aa80066e2220b4dffbc2ff5008dc3a6fb..6d6d514758d44e4e0221a373c1105d1bec7d5eff 100644 (file)
--- a/mille/init.c
+++ b/mille/init.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: init.c,v 1.8 1999/09/30 18:01:32 jsm Exp $     */
+/*     $NetBSD: init.c,v 1.11 2009/05/25 23:34:50 dholland Exp $       */
 
 /*
  * Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,18 +34,18 @@
 #if 0
 static char sccsid[] = "@(#)init.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.8 1999/09/30 18:01:32 jsm Exp $");
+__RCSID("$NetBSD: init.c,v 1.11 2009/05/25 23:34:50 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "mille.h"
+#include "mille.h"
 
 /*
  * @(#)init.c  1.1 (Berkeley) 4/1/82
  */
 
 void
-init()
+init(void)
 {
        PLAY    *pp;
        int     i, j;
@@ -93,7 +89,7 @@ init()
 }
 
 void
-shuffle()
+shuffle(void)
 {
        int     i, r;
        CARD    temp;
@@ -112,7 +108,7 @@ shuffle()
 }
 
 void
-newboard()
+newboard(void)
 {
        int             i;
        PLAY            *pp;
@@ -171,7 +167,7 @@ newboard()
 }
 
 void
-newscore()
+newscore(void)
 {
        int             i, new;
        PLAY            *pp;