Fix compiler warnings.

[tinc] / src / event.h

diff --git a/src/event.h b/src/event.h
index 5833ad1..38a4eb4 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,7 +1,7 @@
 /*
     event.h -- header for event.c
-    Copyright (C) 2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2002-2009 Guus Sliepen <guus@tinc-vpn.org>,
+                  2002-2005 Ivo Timmermans
 
     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
@@ -13,24 +13,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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.4.3 2002/09/09 21:24:34 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #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 void (*event_handler_t)(void *);
 
-typedef struct {
+typedef struct event {
        time_t time;
        int id;
        event_handler_t handler;
@@ -39,10 +36,12 @@ typedef struct {
 
 extern void init_events(void);
 extern void exit_events(void);
-extern event_t *new_event(void);
+extern void expire_events(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);
+extern event_t *peek_next_event(void);
 
 #endif                                                 /* __TINC_EVENT_H__ */