From 719921c6b2c9ada81455b4a32fc99807230266ca Mon Sep 17 00:00:00 2001
From: he <he@NetBSD.org>
Date: Sun, 11 Apr 2004 13:35:06 +0000
Subject: Undef bool before including <curses.h>, since it tries to typedef
 bool.  Otherwise we get (at least on gcc 2.95.3) an empty declaration warning
 from "typedef char char;" due to the #define of bool in phantstruct.h.

---
 phantasia/fight.c       | 3 ++-
 phantasia/gamesupport.c | 3 ++-
 phantasia/interplayer.c | 3 ++-
 phantasia/io.c          | 3 ++-
 phantasia/main.c        | 3 ++-
 phantasia/misc.c        | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'phantasia')

diff --git a/phantasia/fight.c b/phantasia/fight.c
index fbd45546..cb446828 100644
--- a/phantasia/fight.c
+++ b/phantasia/fight.c
@@ -1,10 +1,11 @@
-/*	$NetBSD: fight.c,v 1.9 2004/04/07 17:46:47 ross Exp $	*/
+/*	$NetBSD: fight.c,v 1.10 2004/04/11 13:35:06 he Exp $	*/
 
 /*
  * fight.c   Phantasia monster fighting routines
  */
 
 #include "include.h"
+#undef bool
 #include <curses.h>
 
 void
diff --git a/phantasia/gamesupport.c b/phantasia/gamesupport.c
index 3efff88b..97dd1cce 100644
--- a/phantasia/gamesupport.c
+++ b/phantasia/gamesupport.c
@@ -1,10 +1,11 @@
-/*	$NetBSD: gamesupport.c,v 1.7 2004/04/07 17:46:47 ross Exp $	*/
+/*	$NetBSD: gamesupport.c,v 1.8 2004/04/11 13:35:06 he Exp $	*/
 
 /*
  * gamesupport.c - auxiliary routines for support of Phantasia
  */
 
 #include "include.h"
+#undef bool
 #include <curses.h>
 
 void
diff --git a/phantasia/interplayer.c b/phantasia/interplayer.c
index 53cd37ba..e10747d2 100644
--- a/phantasia/interplayer.c
+++ b/phantasia/interplayer.c
@@ -1,10 +1,11 @@
-/*	$NetBSD: interplayer.c,v 1.7 2004/04/07 17:46:47 ross Exp $	*/
+/*	$NetBSD: interplayer.c,v 1.8 2004/04/11 13:35:06 he Exp $	*/
 
 /*
  * interplayer.c - player to player routines for Phantasia
  */
 
 #include "include.h"
+#undef bool
 #include <curses.h>
 
 void
diff --git a/phantasia/io.c b/phantasia/io.c
index ea61b689..8caf069b 100644
--- a/phantasia/io.c
+++ b/phantasia/io.c
@@ -1,10 +1,11 @@
-/*	$NetBSD: io.c,v 1.7 2004/04/07 17:46:47 ross Exp $	*/
+/*	$NetBSD: io.c,v 1.8 2004/04/11 13:35:06 he Exp $	*/
 
 /*
  * io.c - input/output routines for Phantasia
  */
 
 #include "include.h"
+#undef bool
 #include <curses.h>
 
 void
diff --git a/phantasia/main.c b/phantasia/main.c
index 794eb42a..b18b3240 100644
--- a/phantasia/main.c
+++ b/phantasia/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.13 2004/04/07 17:46:47 ross Exp $	*/
+/*	$NetBSD: main.c,v 1.14 2004/04/11 13:35:06 he Exp $	*/
 
 /*
  * Phantasia 3.3.2 -- Interterminal fantasy game
@@ -56,6 +56,7 @@
  */
 
 #include "include.h"
+#undef bool
 #include <curses.h>
 
 int	main(int, char **);
diff --git a/phantasia/misc.c b/phantasia/misc.c
index 50f79c01..850b51ee 100644
--- a/phantasia/misc.c
+++ b/phantasia/misc.c
@@ -1,10 +1,11 @@
-/*	$NetBSD: misc.c,v 1.11 2004/04/07 17:46:47 ross Exp $	*/
+/*	$NetBSD: misc.c,v 1.12 2004/04/11 13:35:06 he Exp $	*/
 
 /*
  * misc.c  Phantasia miscellaneous support routines
  */
 
 #include "include.h"
+#undef bool
 #include <curses.h>
 
 
-- 
cgit v1.2.3-56-ge451