Module Name: src
Committed By: matt
Date: Sat Feb 18 06:57:23 UTC 2012
Modified Files:
src/games/gomoku: bdisp.c
src/games/larn: global.c
Log Message:
Fix conflicting variable definitions
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/games/gomoku/bdisp.c
cvs rdiff -u -r1.12 -r1.13 src/games/larn/global.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/bdisp.c
diff -u src/games/gomoku/bdisp.c:1.15 src/games/gomoku/bdisp.c:1.16
--- src/games/gomoku/bdisp.c:1.15 Mon Mar 29 04:28:47 2010
+++ src/games/gomoku/bdisp.c Sat Feb 18 06:57:23 2012
@@ -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.
Index: src/games/larn/global.c
diff -u src/games/larn/global.c:1.12 src/games/larn/global.c:1.13
--- src/games/larn/global.c:1.12 Mon Feb 4 01:07:01 2008
+++ src/games/larn/global.c Sat Feb 18 06:57:23 2012
@@ -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()
