Fix time() conflicts on alpha.

 - disable "long time()"
 - replace long with time_t for time counter.

2 files changed, 72 insertions, 0 deletions

diff --git a/astro/xphoon/files/patch-ab b/astro/xphoon/files/patch-ab
new file mode 100644
index 000000000000..2745701a8932
--- /dev/null
+++ b/astro/xphoon/files/patch-ab
@@ -0,0 +1,30 @@
+--- xphoon.c.orig	Thu Sep 19 04:57:37 1991
++++ xphoon.c	Sun Jan  3 18:30:29 1999
+@@ -31,9 +31,18 @@
+ 
+ /* Externals. */
+ 
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
++#if (defined(BSD) && (BSD >= 199306))
++#include <stdlib.h>
++#include <time.h>
++#else
+ extern char* malloc();
+ extern long time();
+ extern long random();
++#endif
+ 
+ extern void getbits();
+ extern double jtime();
+@@ -65,7 +74,7 @@
+     int blackflag, demoflag;
+     int printpid;
+     char* display_name;
+-    long clock;
++    time_t clock;
+     int pid, tty;
+     int size;
+     char* mooncopy;
diff --git a/astro/xphoon/files/patch-ac b/astro/xphoon/files/patch-ac
new file mode 100644
index 000000000000..e5e35cd66b77
--- /dev/null
+++ b/astro/xphoon/files/patch-ac
@@ -0,0 +1,42 @@
+--- dtime.c.orig	Sat Sep 14 14:15:25 1991
++++ dtime.c	Sun Jan  3 18:36:48 1999
+@@ -26,13 +26,20 @@
+ #include <sys/timeb.h>
+ #endif /*SYS5*/
+ 
++
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
++#if !(defined(BSD) && (BSD >= 199306))
+ extern long time();
+ struct tm* localtime();
++#endif
+ 
+ struct tws*
+ dtwstime()
+     {
+-    long clock;
++    time_t clock;
+ 
+     (void) time( &clock );
+     return dlocaltime( &clock );
+@@ -40,7 +47,7 @@
+ 
+ struct tws*
+ dlocaltime( clock )
+-    long* clock;
++    time_t* clock;
+     {
+     register struct tm* tm;
+ #ifndef SYS5
+@@ -48,7 +55,7 @@
+ #endif not SYS5
+     static struct tws tw;
+ 
+-    if ( clock == (long*) 0 )
++    if ( clock == (time_t*) 0 )
+ 	return (struct tws*) 0;
+     tw.tw_flags = TW_NULL;
+