From a36a075433165839ec7a02379ad83c03e08498a5 Mon Sep 17 00:00:00 2001 From: Kenneth G Raeburn Date: Tue, 13 Nov 1990 12:02:59 +0000 Subject: C++ conversion and lots of modifications from summer & fall work --- server/timer.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'server/timer.h') diff --git a/server/timer.h b/server/timer.h index 31b59ee..342340f 100644 --- a/server/timer.h +++ b/server/timer.h @@ -41,9 +41,9 @@ typedef struct _timer { /* time for timer to go off, absolute time */ long alarm_time; /* procedure to call when timer goes off */ - void (*func)(); + void (*func)(void*); /* argument for that procedure */ - caddr_t arg; + void * arg; } *timer; #define ALARM_TIME(x) ((x)->alarm_time) @@ -53,10 +53,15 @@ typedef struct _timer { #define ALARM_ARG(x) ((x)->arg) #define TIMER_SIZE sizeof(struct _timer) -time_t time(); +#ifdef mips +#define time_t long /* sigh */ +#endif +extern "C" time_t time(time_t*); #define NOW (time((time_t *)NULL)) -extern timer timer_set_rel(), timer_set_abs(); -extern void timer_reset(), timer_process(); +typedef void (*timer_proc) (void *); +extern timer timer_set_rel(long, timer_proc, void*); +extern timer timer_set_abs(long, timer_proc, void*); +extern void timer_reset(timer), timer_process(void); #define timer_when(x) ALARM_TIME(x) -- cgit v1.2.3