Fix merge conflicts

[bsdgames-darwin.git] / hangman / hangman.h

diff --git a/hangman/hangman.h b/hangman/hangman.h
index 6ab760bf6f359c8dfdd12f540aab4b03bc005b3e..1b24ba1309e703b177c95adf8343274522b39149 100644 (file)
--- a/hangman/hangman.h
+++ b/hangman/hangman.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: hangman.h,v 1.9 1999/09/08 21:45:28 jsm Exp $  */
+/*     $NetBSD: hangman.h,v 1.14 2011/08/26 06:18:17 dholland Exp $    */

 
 /*
  * Copyright (c) 1983, 1993
 
 /*
  * Copyright (c) 1983, 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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -73,23 +69,26 @@ extern char Word[], Known[];
 extern const char *const Noose_pict[];
 
 extern int Errors, Wordnum;
 extern const char *const Noose_pict[];
 
 extern int Errors, Wordnum;

+extern unsigned int Minlen;

 
 extern double Average;
 
 extern const ERR_POS Err_pos[];
 
 
 extern double Average;
 
 extern const ERR_POS Err_pos[];
 

+extern const char *Dict_name;
+

 extern FILE *Dict;
 
 extern off_t Dict_size;
 
 extern FILE *Dict;
 
 extern off_t Dict_size;
 

-void    die __P((int)) __attribute__((__noreturn__));
-void    endgame __P((void));
-int    main __P((void));
-void   getguess __P((void));
-void   getword __P((void));
-void   playgame __P((void));
-void   prdata __P((void));
-void   prman __P((void));
-void   prword __P((void));
-int    readch __P((void));
-void   setup __P((void));
+void    die(int) __dead;
+void    endgame(void);
+int    main(int, char *[]);
+void   getguess(void);
+void   getword(void);
+void   playgame(void);
+void   prdata(void);
+void   prman(void);
+void   prword(void);
+int    readch(void);
+void   setup(void);