Simplify signal handling.

[tinc] / src / event.h

diff --git a/src/event.h b/src/event.h
index 0ff8e01..d0f1911 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,3 +1,6 @@
+#ifndef TINC_EVENT_H
+#define TINC_EVENT_H
+
 /*
     event.h -- I/O, timeout and signal event handling
     Copyright (C) 2012-2013 Guus Sliepen <guus@tinc-vpn.org>
@@ -17,9 +20,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
-
+#include "system.h"
 #include "splay_tree.h"
 
 #define IO_READ 1
@@ -51,14 +52,13 @@ typedef struct signal_t {
        int signum;
        signal_cb_t cb;
        void *data;
-       splay_node_t node;
 } signal_t;
 
 extern struct timeval now;
 
 extern void io_add(io_t *io, io_cb_t cb, void *data, int fd, int flags);
 #ifdef HAVE_MINGW
-extern void io_add_event(io_t *io, io_cb_t cb, void* data, WSAEVENT event);
+extern void io_add_event(io_t *io, io_cb_t cb, void *data, WSAEVENT event);
 #endif
 extern void io_del(io_t *io);
 extern void io_set(io_t *io, int flags);