diff options
| author | jsm <jsm@NetBSD.org> | 2004-01-26 09:59:36 +0000 |
|---|---|---|
| committer | jsm <jsm@NetBSD.org> | 2004-01-26 09:59:36 +0000 |
| commit | fab68984a6f4207d48e9315ac074c3bfb17015cb (patch) | |
| tree | 4545ac03d67022868ea4fa7a559d367dbe8c15e1 | |
| parent | 6267dec9c994556fa09a1f244c8dea227a3bfd21 (diff) | |
| download | bsdgames-darwin-fab68984a6f4207d48e9315ac074c3bfb17015cb.tar.gz bsdgames-darwin-fab68984a6f4207d48e9315ac074c3bfb17015cb.zip | |
Rename yn to yncoms to avoid conflict with GCC 3.4 built-in XSI
function.
| -rw-r--r-- | monop/misc.c | 6 | ||||
| -rw-r--r-- | monop/monop.def | 4 | ||||
| -rw-r--r-- | monop/monop.ext | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/monop/misc.c b/monop/misc.c index 27612a0d..f9a37557 100644 --- a/monop/misc.c +++ b/monop/misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.11 2003/08/07 09:37:28 agc Exp $ */ +/* $NetBSD: misc.c,v 1.12 2004/01/26 09:59:36 jsm Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: misc.c,v 1.11 2003/08/07 09:37:28 agc Exp $"); +__RCSID("$NetBSD: misc.c,v 1.12 2004/01/26 09:59:36 jsm Exp $"); #endif #endif /* not lint */ @@ -53,7 +53,7 @@ getyn(prompt) int com; for (;;) - if ((com=getinp(prompt, yn)) < 2) + if ((com=getinp(prompt, yncoms)) < 2) return com; else (*func[com-2])(); diff --git a/monop/monop.def b/monop/monop.def index 63649ee6..c9462abc 100644 --- a/monop/monop.def +++ b/monop/monop.def @@ -1,4 +1,4 @@ -/* $NetBSD: monop.def,v 1.7 2003/08/07 09:37:28 agc Exp $ */ +/* $NetBSD: monop.def,v 1.8 2004/01/26 09:59:36 jsm Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -52,7 +52,7 @@ const char *name_list[MAX_PL+2], /* list of players' names */ "", /* 16 */ 0 }, - *const yn[] = { /* list of commands for yes/no answers */ + *const yncoms[] = { /* list of commands for yes/no answers */ "yes", /* 0 */ "no", /* 1 */ "quit", /* 2 */ "print", /* 3 */ "where", /* 4 */ "own holdings", /* 5 */ diff --git a/monop/monop.ext b/monop/monop.ext index fe227517..f1214ab2 100644 --- a/monop/monop.ext +++ b/monop/monop.ext @@ -1,4 +1,4 @@ -/* $NetBSD: monop.ext,v 1.5 2003/08/07 09:37:29 agc Exp $ */ +/* $NetBSD: monop.ext,v 1.6 2004/01/26 09:59:36 jsm Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -36,7 +36,7 @@ extern bool trading, spec, fixing, told_em; -extern const char *const yn[], *const comlist[], *name_list[], *const lucky_mes[]; +extern const char *const yncoms[], *const comlist[], *name_list[], *const lucky_mes[]; extern int num_play, player, num_doub, num_luck; |