Fix conflicting variable definitions
This commit is contained in:
parent
d9a1d7a11e
commit
29f82ac3aa
|
@ -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
|
* Copyright (c) 1994
|
||||||
|
@ -37,7 +37,7 @@
|
||||||
#if 0
|
#if 0
|
||||||
static char sccsid[] = "@(#)bdisp.c 8.2 (Berkeley) 5/3/95";
|
static char sccsid[] = "@(#)bdisp.c 8.2 (Berkeley) 5/3/95";
|
||||||
#else
|
#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
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ static int lastline;
|
||||||
static char pcolor[] = "*O.?";
|
static char pcolor[] = "*O.?";
|
||||||
|
|
||||||
extern int interactive;
|
extern int interactive;
|
||||||
extern char *plyr[];
|
extern const char *plyr[];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize screen display.
|
* Initialize screen display.
|
||||||
|
|
|
@ -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.
|
* global.c Larn is copyrighted 1986 by Noah Morgan.
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
*/
|
*/
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
#ifndef lint
|
#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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -32,7 +32,7 @@ extern int score[], dropflag;
|
||||||
extern char *what[], *who[];
|
extern char *what[], *who[];
|
||||||
extern char winner[];
|
extern char winner[];
|
||||||
extern char sciv[SCORESIZE + 1][26][2];
|
extern char sciv[SCORESIZE + 1][26][2];
|
||||||
extern char *password;
|
extern const char *password;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
raiselevel()
|
raiselevel()
|
||||||
|
|
Loading…
Reference in New Issue