From 1108b046f041c0bf0be042f6fd91eb2b7dae7af1 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Wed, 27 May 2009 17:44:38 +0000
Subject: Rearrange where the alternate definition of __dead goes. It can't be
 before "include.h" as that includes a bunch of system headers, but it can't
 be after either as it also includes a bunch of local headers. Therefore, it
 needs to be *in* include.h.

---
 phantasia/include.h | 6 +++++-
 phantasia/setup.c   | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phantasia')

diff --git a/phantasia/include.h b/phantasia/include.h
index e54c5c49..a765363b 100644
--- a/phantasia/include.h
+++ b/phantasia/include.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: include.h,v 1.5 2004/04/07 17:46:47 ross Exp $	*/
+/*	$NetBSD: include.h,v 1.6 2009/05/27 17:44:38 dholland Exp $	*/
 
 /*
  * include.h - includes all important files for Phantasia
@@ -15,6 +15,10 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifndef __dead /* Not NetBSD */
+#define __dead
+#endif
+
 #include "macros.h"
 #include "phantdefs.h"
 #include "phantstruct.h"
diff --git a/phantasia/setup.c b/phantasia/setup.c
index 1d5f9514..bdb9f74b 100644
--- a/phantasia/setup.c
+++ b/phantasia/setup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.19 2009/05/25 23:08:45 dholland Exp $	*/
+/*	$NetBSD: setup.c,v 1.20 2009/05/27 17:44:38 dholland Exp $	*/
 
 /*
  * setup.c - set up all files for Phantasia
@@ -13,10 +13,6 @@
 #include <fcntl.h>
 #include "include.h"
 
-#ifndef __dead /* Not NetBSD */
-#define __dead
-#endif
-
 int main(int, char *[]);
 void Error(const char *, const char *) __dead;
 double drandom(void);
-- 
cgit v1.2.3-56-ge451