Synchronise HEAD with CABAL branch.

[tinc] / src / event.h

diff --git a/lib/event.h b/src/event.h
similarity index 73%
rename from lib/event.h
rename to src/event.h
index df0c6d8..0bc712c 100644 (file)
--- a/lib/event.h
+++ b/src/event.h
@@ -1,7 +1,7 @@
 /*
     event.h -- header for event.c
-    Copyright (C) 2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2002 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2002-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2002-2003 Ivo Timmermans <ivo@o2w.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,32 +17,31 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: event.h,v 1.1 2002/05/02 13:11:55 zarq Exp $
+    $Id: event.h,v 1.4 2003/08/24 20:38:24 guus Exp $
 */
 
 #ifndef __TINC_EVENT_H__
 #define __TINC_EVENT_H__
 
-#include <time.h>
-#include <avl_tree.h>
+#include "avl_tree.h"
 
-avl_tree_t *event_tree;
+extern avl_tree_t *event_tree;
 
 typedef void (*event_handler_t)(void *);
 
 typedef struct {
-  time_t time;
-  int id;
-  event_handler_t handler;
-  void *data;
+       time_t time;
+       int id;
+       event_handler_t handler;
+       void *data;
 } event_t;
 
 extern void init_events(void);
 extern void exit_events(void);
-extern event_t *new_event(void);
+extern event_t *new_event(void) __attribute__ ((__malloc__));
 extern void free_event(event_t *);
 extern void event_add(event_t *);
 extern void event_del(event_t *);
 extern event_t *get_expired_event(void);
 
-#endif /* __TINC_EVENT_H__ */
+#endif                                                 /* __TINC_EVENT_H__ */