can't have config.h and config.H in case-preserving but case-folding file-systems.

[bsdgames-darwin.git] / mille / extern.c

diff --git a/mille/extern.c b/mille/extern.c
index 81039ff0c71733756858fa12beeec53f1beded1d..6a07a3dceffc061651b5c5fa0af9c74aa12e1ea5 100644 (file)
--- a/mille/extern.c
+++ b/mille/extern.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.c,v 1.6 1999/09/08 21:17:50 jsm Exp $   */
+/*     $NetBSD: extern.c,v 1.11 2011/08/16 11:14:04 christos Exp $     */
 
 /*
  * Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,11 +34,11 @@
 #if 0
 static char sccsid[] = "@(#)extern.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: extern.c,v 1.6 1999/09/08 21:17:50 jsm Exp $");
+__RCSID("$NetBSD: extern.c,v 1.11 2011/08/16 11:14:04 christos Exp $");
 #endif
 #endif /* not lint */
 
-# include      "mille.h"
+#include "mille.h"
 
 /*
  * @(#)extern.c        1.1 (Berkeley) 4/1/82
@@ -55,10 +51,9 @@ bool Debug,                  /* set if debugging code on             */
        Order,                  /* set if hand should be sorted         */
        Saved;                  /* set if game just saved               */
 
-char   Initstr[100];           /* initial string for error field       */
-const char     *C_fmt = "%-18.18s",    /* format for printing cards    */
-       *Fromfile = NULL,       /* startup file for game                */
-       *const _cn[NUM_CARDS] = {       /* Card name buffer             */
+char   Initstr[INITSTR_SIZE];  /* initial string for error field       */
+const char *Fromfile = NULL;   /* startup file for game                */
+static const char *const _cn[NUM_CARDS] = {/* Card name buffer         */
                "",
                "25",
                "50",
@@ -79,8 +74,8 @@ const char    *C_fmt = "%-18.18s",    /* format for printing cards    */
                "Puncture Proof",
                "Driving Ace",
                "Right of Way"
-       },
-       *const *C_name = &_cn[1];       /* Card names                   */
+};
+const char *const *C_name = &_cn[1];   /* Card names                   */
 
 int    Card_no,                /* Card number for current move         */
        End,                    /* End value for current hand           */