summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2012-02-18 06:57:23 +0000
committermatt <matt@NetBSD.org>2012-02-18 06:57:23 +0000
commit6d80e805c700c9ffb05d5280da76c91ba0f2d039 (patch)
tree30333bfe46e1c96358d48db3aa7a65860969a49c
parent5460cd550b3ec9201340ebc71228a56350259fc7 (diff)
downloadbsdgames-darwin-6d80e805c700c9ffb05d5280da76c91ba0f2d039.tar.gz
bsdgames-darwin-6d80e805c700c9ffb05d5280da76c91ba0f2d039.tar.zst
bsdgames-darwin-6d80e805c700c9ffb05d5280da76c91ba0f2d039.zip
Fix conflicting variable definitions
-rw-r--r--gomoku/bdisp.c6
-rw-r--r--larn/global.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/gomoku/bdisp.c b/gomoku/bdisp.c
index 83db2d06..ae18d455 100644
--- a/gomoku/bdisp.c
+++ b/gomoku/bdisp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bdisp.c,v 1.15 2010/03/29 04:28:47 dholland Exp $ */
+/* $NetBSD: bdisp.c,v 1.16 2012/02/18 06:57:23 matt 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.15 2010/03/29 04:28:47 dholland Exp $");
+__RCSID("$NetBSD: bdisp.c,v 1.16 2012/02/18 06:57:23 matt Exp $");
#endif
#endif /* not lint */
@@ -54,7 +54,7 @@ static int lastline;
static char pcolor[] = "*O.?";
extern int interactive;
-extern char *plyr[];
+extern const char *plyr[];
/*
* Initialize screen display.
diff --git a/larn/global.c b/larn/global.c
index bade6a23..54d34af7 100644
--- a/larn/global.c
+++ b/larn/global.c
@@ -1,4 +1,4 @@
-/* $NetBSD: global.c,v 1.12 2008/02/04 01:07:01 dholland Exp $ */
+/* $NetBSD: global.c,v 1.13 2012/02/18 06:57:23 matt Exp $ */
/*
* global.c Larn is copyrighted 1986 by Noah Morgan.
@@ -21,7 +21,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: global.c,v 1.12 2008/02/04 01:07:01 dholland Exp $");
+__RCSID("$NetBSD: global.c,v 1.13 2012/02/18 06:57:23 matt Exp $");
#endif /* not lint */
#include <string.h>
@@ -32,7 +32,7 @@ extern int score[], dropflag;
extern char *what[], *who[];
extern char winner[];
extern char sciv[SCORESIZE + 1][26][2];
-extern char *password;
+extern const char *password;
/*
raiselevel()