From ac16f380e349fa39ec7e26bccb5456cb300006a5 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 14 Sep 1997 17:50:06 +0000
Subject: Pull in sources from zephyr locker.  See /mit/zephyr/repository for
 detailed change information.

---
 server/timer.h | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

(limited to 'server/timer.h')

diff --git a/server/timer.h b/server/timer.h
index 231208f..42c0081 100644
--- a/server/timer.h
+++ b/server/timer.h
@@ -6,11 +6,12 @@
  *
  *      $Source$
  *      $Author$
- *      $Header: /mit/zephyr/src/server/RCS/timer.h,v 1.9 94/03/15 12:44:40 prob
-e Exp $
+ *      $Header$
  *
  */
 
+#ifndef __TIMER_H
+
 /*
  * timer_manager_ -- routines for handling timers in login_shell
  * (and elsewhere)
@@ -36,31 +37,20 @@ without express or implied warranty.
 
  */
 
-#ifdef __STDC__
-# define        P(s) s
-#else
-# define P(s) ()
-#endif
-
-typedef struct _timer {
-        int heap_pos;
-        /* time for timer to go off, absolute time */
-        long    time;
-        /* procedure to call when timer goes off */
-        void    (*func)P((void*));
-        /* argument for that procedure */
-        void *  arg;
-} *timer;
+typedef void (*timer_proc) __P((void *));
 
-#define NOW t_local.tv_sec
-typedef void (*timer_proc) P((void *));
-extern timer timer_set_rel P((long, timer_proc, void*));
-extern timer timer_set_abs P((long, timer_proc, void*));
-extern void timer_reset P((timer)), timer_process P((void));
+typedef struct _Timer {
+        int		heap_pos;	/* Position in timer heap */
+        long    	abstime;
+        timer_proc	func;
+        void		*arg;
+} Timer;
 
-#undef P
+Timer *timer_set_rel __P((long, timer_proc, void *));
+Timer *timer_set_abs __P((long, timer_proc, void *));
+void timer_reset __P((Timer *));
+void timer_process __P((void));
+struct timeval *timer_timeout __P((struct timeval *tvbuf));
 
-#define timer_when(x)   ALARM_TIME(x)
+#endif /* __TIMER_H */
 
-extern struct timeval t_local;
-extern long nexttimo;                   /* Unix time of next timout */
-- 
cgit v1.2.3