diff --git a/games/mille/extern.c b/games/mille/extern.c index 445bca70f8d5..6a07a3dceffc 100644 --- a/games/mille/extern.c +++ b/games/mille/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.10 2009/08/12 08:07:27 dholland Exp $ */ +/* $NetBSD: extern.c,v 1.11 2011/08/16 11:14:04 christos Exp $ */ /* * Copyright (c) 1982, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.10 2009/08/12 08:07:27 dholland Exp $"); +__RCSID("$NetBSD: extern.c,v 1.11 2011/08/16 11:14:04 christos Exp $"); #endif #endif /* not lint */ @@ -52,7 +52,6 @@ bool Debug, /* set if debugging code on */ Saved; /* set if game just saved */ char Initstr[INITSTR_SIZE]; /* initial string for error field */ -const char *C_fmt = "%-18.18s"; /* format for printing cards */ const char *Fromfile = NULL; /* startup file for game */ static const char *const _cn[NUM_CARDS] = {/* Card name buffer */ "", diff --git a/games/mille/mille.h b/games/mille/mille.h index e9672a7a6da9..10326d892aa0 100644 --- a/games/mille/mille.h +++ b/games/mille/mille.h @@ -1,4 +1,4 @@ -/* $NetBSD: mille.h,v 1.17 2009/08/12 08:07:27 dholland Exp $ */ +/* $NetBSD: mille.h,v 1.18 2011/08/16 11:14:04 christos Exp $ */ /* * Copyright (c) 1982, 1993 @@ -212,7 +212,8 @@ extern bool Debug, Finished, Next, On_exit, Order, Saved; #define INITSTR_SIZE 100 extern char Initstr[INITSTR_SIZE]; -extern const char *C_fmt, *const *C_name, *Fromfile; +extern const char *const *C_name, *Fromfile; +#define C_fmt "%-18.18s" extern int Card_no, End, Handstart, Movetype, Numgos, Numneed[], Numseen[NUM_CARDS], Play, Window; diff --git a/games/mille/print.c b/games/mille/print.c index 8333179ebfc5..68e830d02012 100644 --- a/games/mille/print.c +++ b/games/mille/print.c @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.16 2011/05/23 22:59:27 joerg Exp $ */ +/* $NetBSD: print.c,v 1.17 2011/08/16 11:14:04 christos Exp $ */ /* * Copyright (c) 1982, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: print.c,v 1.16 2011/05/23 22:59:27 joerg Exp $"); +__RCSID("$NetBSD: print.c,v 1.17 2011/08/16 11:14:04 christos Exp $"); #endif #endif /* not lint */ @@ -115,7 +115,7 @@ show_card(int y, int x, CARD c, CARD *lc) *lc = c; } -static char Score_fmt[] = "%4d"; +#define Score_fmt "%4d" void prscore(bool for_real)