A first attempt at merging UTCP into MeshLink.

[meshlink] / src / event.h

diff --git a/src/event.h b/src/event.h
index 3d49fe2d9b825e74e41d9c581b3b4891fd993290..c90e50679a171971bde932e51ed7f866d9ceae9e 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -17,10 +17,11 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
+#ifndef __MESHLINK_EVENT_H__
+#define __MESHLINK_EVENT_H__
 
 #include "splay_tree.h"
+#include "system.h"
 
 #define IO_READ 1
 #define IO_WRITE 2
@@ -70,9 +71,6 @@ struct event_loop_t {
        void *data;
 };
 
-extern event_loop_t *loop;
-extern struct timeval now;
-
 extern void io_add(event_loop_t *loop, io_t *io, io_cb_t cb, void *data, int fd, int flags);
 extern void io_del(event_loop_t *loop, io_t *io);
 extern void io_set(event_loop_t *loop, io_t *io, int flags);