Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/games Fix conflicting variable definitions



details:   https://anonhg.NetBSD.org/src/rev/f134c3e13dce
branches:  trunk
changeset: 777423:f134c3e13dce
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Feb 18 06:57:23 2012 +0000

description:
Fix conflicting variable definitions

diffstat:

 games/gomoku/bdisp.c |  6 +++---
 games/larn/global.c  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r e4f8deb2264e -r f134c3e13dce games/gomoku/bdisp.c
--- a/games/gomoku/bdisp.c      Sat Feb 18 06:29:10 2012 +0000
+++ b/games/gomoku/bdisp.c      Sat Feb 18 06:57:23 2012 +0000
@@ -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 char    pcolor[] = "*O.?";
 
 extern int interactive;
-extern char *plyr[];
+extern const char *plyr[];
 
 /*
  * Initialize screen display.
diff -r e4f8deb2264e -r f134c3e13dce games/larn/global.c
--- a/games/larn/global.c       Sat Feb 18 06:29:10 2012 +0000
+++ b/games/larn/global.c       Sat Feb 18 06:57:23 2012 +0000
@@ -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 char     *what[], *who[];
 extern char     winner[];
 extern char     sciv[SCORESIZE + 1][26][2];
-extern char    *password;
+extern const char *password;
 
 /*
        raiselevel()



Home | Main Index | Thread Index | Old Index