Make work on Alpha - mostly s/long/time_t/ in the right places.

5 files changed, 128 insertions, 2 deletions

diff --git a/games/moria/patches/patch-ad b/games/moria/patches/patch-ad
index 1aeb4717efa..edc7eacf489 100644
--- a/games/moria/patches/patch-ad
+++ b/games/moria/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/01/23 17:00:15 simonb Exp $
+$NetBSD: patch-ad,v 1.2 1999/08/30 02:35:10 simonb Exp $
 --- source/io.c.orig	Fri Jul 22 11:47:26 1994
-+++ source/io.c	Wed Dec  2 11:35:27 1998
++++ source/io.c	Sun Aug 29 09:08:13 1999
 @@ -90,6 +90,10 @@
  #include <sys/types.h>
  #endif
@@ -12,6 +12,15 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/01/23 17:00:15 simonb Exp $
  #ifdef USG
  #ifndef ATARI_ST
  #include <string.h>
+@@ -245,7 +249,7 @@
+   struct ltchars lcbuf;
+   struct tchars cbuf;
+   int lbuf;
+-  long time();
++  time_t time();
+ 
+   py.misc.male |= 2;
+   (void) ioctl(0, TIOCGETP, (char *)&tbuf);
 @@ -331,7 +335,7 @@
  #if defined(atarist) && defined(__GNUC__)
    (void) signal (SIGTSTP, (__Sigfunc)suspend);
diff --git a/games/moria/patches/patch-af b/games/moria/patches/patch-af
new file mode 100644
index 00000000000..06af9c945c3
--- /dev/null
+++ b/games/moria/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 1999/08/30 02:35:10 simonb Exp $
+--- source/death.c.orig	Fri Jul 22 11:47:16 1994
++++ source/death.c	Sun Aug 29 09:28:44 1999
+@@ -126,7 +126,7 @@
+ #ifndef VMS
+ #ifndef MAC
+ #if !defined(ATARIST_MWC) && !defined(AMIGA)
+-long time();
++time_t time();
+ #endif
+ #endif
+ #endif
+@@ -144,9 +144,9 @@
+ #ifdef MAC
+   clockvar = time((time_t *) 0);
+ #else
+-  clockvar = time((long *) 0);
++  clockvar = time((time_t *) 0);
+ #endif
+-  tmp = ctime(&clockvar);
++  tmp = ctime((time_t *)&clockvar);
+   tmp[10] = '\0';
+   (void) strcpy(day, tmp);
+ }
diff --git a/games/moria/patches/patch-ag b/games/moria/patches/patch-ag
new file mode 100644
index 00000000000..f6e8009f794
--- /dev/null
+++ b/games/moria/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 1999/08/30 02:35:10 simonb Exp $
+--- source/main.c.orig	Fri Jul 22 11:47:27 1994
++++ source/main.c	Sun Aug 29 09:25:32 1999
+@@ -92,7 +92,7 @@
+ #ifndef MAC
+ #ifndef GEMDOS
+ #ifndef AMIGA
+-long time();
++time_t time();
+ #endif
+ #endif
+ char *getenv();
+@@ -363,7 +363,7 @@
+ #ifdef MAC
+       birth_date = time ((time_t *)0);
+ #else
+-      birth_date = time ((long *)0);
++      birth_date = time ((time_t *)0);
+ #endif
+       char_inven_init();
+       py.flags.food = 7500;
diff --git a/games/moria/patches/patch-ah b/games/moria/patches/patch-ah
new file mode 100644
index 00000000000..15511707ea4
--- /dev/null
+++ b/games/moria/patches/patch-ah
@@ -0,0 +1,33 @@
+$NetBSD: patch-ah,v 1.1 1999/08/30 02:35:10 simonb Exp $
+--- source/misc1.c.orig	Fri Jul 22 11:47:28 1994
++++ source/misc1.c	Sun Aug 29 09:29:19 1999
+@@ -29,7 +29,7 @@
+ #endif
+ 
+ #if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA)
+-long time();
++time_t time();
+ #endif
+ struct tm *localtime();
+ 
+@@ -48,7 +48,7 @@
+ #ifdef MAC
+     clock_var = time((time_t *)0);
+ #else
+-    clock_var = time((long *)0);
++    clock_var = time((time_t *)0);
+ #endif
+   else
+     clock_var = seed;
+@@ -95,9 +95,9 @@
+ #ifdef MAC
+   clock_var = time((time_t *)0);
+ #else
+-  clock_var = time((long *)0);
++  clock_var = time((time_t *)0);
+ #endif
+-  tp = localtime(&clock_var);
++  tp = localtime((time_t *)&clock_var);
+   if (days[tp->tm_wday][tp->tm_hour+4] == 'X')
+     return TRUE;
+   else
diff --git a/games/moria/patches/patch-ai b/games/moria/patches/patch-ai
new file mode 100644
index 00000000000..a1dbe9165fc
--- /dev/null
+++ b/games/moria/patches/patch-ai
@@ -0,0 +1,39 @@
+$NetBSD: patch-ai,v 1.1 1999/08/30 02:35:10 simonb Exp $
+--- source/save.c.orig	Fri Jul 22 11:47:40 1994
++++ source/save.c	Sun Aug 29 09:26:58 1999
+@@ -105,7 +105,7 @@
+ #ifdef MAC
+ #include <time.h>
+ #else
+-long time();
++time_t time();
+ #endif
+ #else
+ char *malloc();
+@@ -334,7 +334,7 @@
+ #ifdef MAC
+   l = time((time_t *)0);
+ #else
+-  l = time((long *)0);
++  l = time((time_t *)0);
+ #endif
+   if (l < start_time)
+     {
+@@ -1032,7 +1032,7 @@
+ #ifdef MAC
+ 	    birth_date = time((time_t *)0);
+ #else
+-	    birth_date = time((long *)0);
++	    birth_date = time((time_t *)0);
+ #endif
+ 	}
+       if ((c = getc(fileptr)) == EOF || (l & 0x80000000L))
+@@ -1256,7 +1256,7 @@
+ #ifdef MAC
+ 	      start_time = time((time_t *)0);
+ #else
+-	      start_time = time((long *)0);
++	      start_time = time((time_t *)0);
+ #endif
+ 	      /* check for reasonable values of time here ... */
+ 	      if (start_time < time_saved)