Module Name: src
Committed By: dholland
Date: Wed May 27 17:44:38 UTC 2009
Modified Files:
src/games/phantasia: include.h setup.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/games/phantasia/include.h
cvs rdiff -u -r1.19 -r1.20 src/games/phantasia/setup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/phantasia/include.h
diff -u src/games/phantasia/include.h:1.5 src/games/phantasia/include.h:1.6
--- src/games/phantasia/include.h:1.5 Wed Apr 7 17:46:47 2004
+++ src/games/phantasia/include.h Wed May 27 17:44:38 2009
@@ -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"
Index: src/games/phantasia/setup.c
diff -u src/games/phantasia/setup.c:1.19 src/games/phantasia/setup.c:1.20
--- src/games/phantasia/setup.c:1.19 Mon May 25 23:08:45 2009
+++ src/games/phantasia/setup.c Wed May 27 17:44:38 2009
@@ -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);
