WARNS=5

[bsdgames-darwin.git] / phantasia / io.c

diff --git a/phantasia/io.c b/phantasia/io.c
index 1f9d330f20a439da2f84accd59feaaaf98aba5b6..64f7e1712b37351d3ec3404934d3b9948d85e040 100644 (file)
--- a/phantasia/io.c
+++ b/phantasia/io.c
@@ -1,14 +1,30 @@
-/*     $NetBSD: io.c,v 1.12 2009/05/25 23:08:45 dholland Exp $ */
+/*     $NetBSD: io.c,v 1.14 2009/08/31 08:27:16 dholland Exp $ */

 
 /*
  * io.c - input/output routines for Phantasia
  */
 
 
 /*
  * io.c - input/output routines for Phantasia
  */
 

-#include "include.h"
-#undef bool

 #include <sys/cdefs.h>
 #include <sys/cdefs.h>

+
+#include <ctype.h>
+#include <math.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "macros.h"
+#include "phantdefs.h"
+#include "phantstruct.h"
+#include "phantglobs.h"
+//#include "pathnames.h"
+
+#undef bool

 #include <curses.h>
 
 #include <curses.h>
 

+static void catchalarm(int) __dead;
+

 void
 getstring(char *cp, int mx)
 {
 void
 getstring(char *cp, int mx)
 {


@@ -234,7 +250,7 @@ getanswer(const char *choices, phbool def)
        return (*choices);
 }
 
        return (*choices);
 }
 

-void
+static void

 catchalarm(int dummy __unused)
 {
        longjmp(Timeoenv, 1);
 catchalarm(int dummy __unused)
 {
        longjmp(Timeoenv, 1);