Fix merge conflicts

[bsdgames-darwin.git] / hangman / prman.c

diff --git a/hangman/prman.c b/hangman/prman.c
index a740f053511a2206d9d4e0862fc6bc8af5508dbf..6a6572f23d751fbc13114be19ce88364f8b6efe6 100644 (file)
--- a/hangman/prman.c
+++ b/hangman/prman.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: prman.c,v 1.6 2012/06/19 05:45:00 dholland Exp $       */
+
 /*-
- * Copyright (c) 1983 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,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.
  *
@@ -31,21 +29,26 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)prman.c    5.3 (Berkeley) 4/8/91";*/
-static char rcsid[] = "$Id: prman.c,v 1.2 1993/08/01 18:54:22 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)prman.c    8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: prman.c,v 1.6 2012/06/19 05:45:00 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "hangman.h"
+#include       "hangman.h"
 
 /*
  * prman:
  *     Print out the man appropriately for the give number
  *     of incorrect guesses.
  */
-prman()
+void
+prman(void)
 {
-       register int    i;
+       int i;
 
        for (i = 0; i < Errors; i++)
                mvaddch(Err_pos[i].y, Err_pos[i].x, Err_pos[i].ch);