Fix merge conflicts

[bsdgames-darwin.git] / gomoku / bdisp.c

diff --git a/gomoku/bdisp.c b/gomoku/bdisp.c
index ae18d455bc2cb21cae7aa733d0e1444bae0e5edd..ce02706c9e386a8a0293cef35e2cfa61a681ecf1 100644 (file)
--- a/gomoku/bdisp.c
+++ b/gomoku/bdisp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: bdisp.c,v 1.16 2012/02/18 06:57:23 matt Exp $  */
+/*     $NetBSD: bdisp.c,v 1.18 2021/05/02 12:50:44 rillig Exp $        */
 
 /*
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)bdisp.c    8.2 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: bdisp.c,v 1.16 2012/02/18 06:57:23 matt Exp $");
+__RCSID("$NetBSD: bdisp.c,v 1.18 2021/05/02 12:50:44 rillig Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,9 +53,6 @@ __RCSID("$NetBSD: bdisp.c,v 1.16 2012/02/18 06:57:23 matt Exp $");
 static int     lastline;
 static char    pcolor[] = "*O.?";
 
-extern int interactive;
-extern const char *plyr[];
-
 /*
  * Initialize screen display.
  */
@@ -339,7 +336,7 @@ get_coord(void)
        nx = curx;
        ny = cury;
        for (;;) {
-               mvprintw(BSZ3, (BSZ -6)/2, "(%c %d) ", 
+               mvprintw(BSZ3, (BSZ -6)/2, "(%c %d) ",
                                'A'+ ((curx > 7) ? (curx+1) : curx), cury + 1);
                BGOTO(cury, curx);