Hand merge of MR !31: Update the CI infrastructure to be faster

[open-adventure.git] / misc.h

diff --git a/misc.h b/misc.h
index 095efba590ac739a385f681b2f6cc79db7f70123..e16c30854e9c0d75cb4e36739d4dc062510575cf 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,3 @@
-#include <time.h>
 #include <stdio.h>
 #include <stdbool.h>
 
@@ -20,12 +19,12 @@ extern long fYES(FILE *,long,long,long);
 #define YES(input,X,Y,Z) fYES(input,X,Y,Z)
 extern long fGETNUM(FILE *);
 #define GETNUM(K) fGETNUM(K)
-extern long fGETTXT(long,long,long,long);
-#define GETTXT(SKIP,ONEWRD,UPPER,HASH) fGETTXT(SKIP,ONEWRD,UPPER,HASH)
+extern long fGETTXT(long,long,long);
+#define GETTXT(SKIP,ONEWRD,UPPER) fGETTXT(SKIP,ONEWRD,UPPER)
 extern long fMAKEWD(long);
 #define MAKEWD(LETTRS) fMAKEWD(LETTRS)
-extern void fPUTTXT(long,long*,long,long);
-#define PUTTXT(WORD,STATE,CASE,HASH) fPUTTXT(WORD,&STATE,CASE,HASH)
+extern void fPUTTXT(long,long*,long);
+#define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE)
 extern void fSHFTXT(long,long);
 #define SHFTXT(FROM,DELTA) fSHFTXT(FROM,DELTA)
 extern void fTYPE0();
@@ -68,11 +67,11 @@ extern void fMPINIT();
 #define MPINIT() fMPINIT()
 extern void fSAVEIO(long,long,long*);
 #define SAVEIO(OP,IN,ARR) fSAVEIO(OP,IN,ARR)
-#define DATIME(D,T) do {struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); D=ts.tv_sec, T=ts.tv_nsec;} while (0)
+extern void DATIME(long*, long*);
 extern long fIABS(long);
 #define IABS(N) fIABS(N)
 extern long fMOD(long,long);
 #define MOD(N,M) fMOD(N,M)
-extern void set_seed_from_time(void);
+extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);