Fix merge conflicts

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

diff --git a/cribbage/extern.c b/cribbage/extern.c
index 1b7c41255661ecc7c389964978e678af847e8047..01b3edd4bbe9ef29cb2d8871b1b38578c3f1fff2 100644 (file)
--- a/cribbage/extern.c
+++ b/cribbage/extern.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.c,v 1.3 1995/03/21 15:08:50 cgd Exp $   */
+/*     $NetBSD: extern.c,v 1.7 2003/08/07 09:37:10 agc Exp $   */
 
 /*-
  * Copyright (c) 1980, 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.
  *
@@ -33,11 +29,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)extern.c   8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: extern.c,v 1.3 1995/03/21 15:08:50 cgd Exp $";
+__RCSID("$NetBSD: extern.c,v 1.7 2003/08/07 09:37:10 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,12 +43,12 @@ static char rcsid[] = "$NetBSD: extern.c,v 1.3 1995/03/21 15:08:50 cgd Exp $";
 #include "deck.h"
 #include "cribbage.h"
 
-bool   explain         = FALSE;        /* player mistakes explained */
-bool   iwon            = FALSE;        /* if comp won last game */
-bool   quiet           = FALSE;        /* if suppress random mess */
-bool   rflag           = FALSE;        /* if all cuts random */
+BOOLEAN        explain         = FALSE;        /* player mistakes explained */
+BOOLEAN        iwon            = FALSE;        /* if comp won last game */
+BOOLEAN        quiet           = FALSE;        /* if suppress random mess */
+BOOLEAN        rflag           = FALSE;        /* if all cuts random */
 
-char   expl[128];                      /* explanation */
+char   explan[128];                    /* explanation */
 
 int    cgames          = 0;            /* number games comp won */
 int    cscore          = 0;            /* comp score in this game */