Fix merge conflicts

[bsdgames-darwin.git] / backgammon / common_source / board.c

diff --git a/backgammon/common_source/board.c b/backgammon/common_source/board.c
index 1c76eddb2d76fdfaca576600e004cb68fea4b306..2c52ea6971c40e749ab860b231e3958d4389e751 100644 (file)
--- a/backgammon/common_source/board.c
+++ b/backgammon/common_source/board.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: board.c,v 1.8 2005/07/01 01:12:39 jmc Exp $    */
+/*     $NetBSD: board.c,v 1.9 2009/08/12 05:17:57 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)board.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: board.c,v 1.8 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: board.c,v 1.9 2009/08/12 05:17:57 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -43,6 +43,8 @@ __RCSID("$NetBSD: board.c,v 1.8 2005/07/01 01:12:39 jmc Exp $");
 static int i, j, k;
 static char ln[60];
 
+static void wrbsub(void);
+
 void
 wrboard(void)
 {
@@ -160,7 +162,7 @@ lastline:
        fixtty(&raw);
 }
 
-void
+static void
 wrbsub(void)
 {
        int     m;