Merge branch 'master' into 1.1

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index f50b2be..cd97e30 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -21,8 +21,6 @@
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
-#include <event.h>
-
 #include "ipv6.h"
 #include "cipher.h"
 #include "digest.h"
@@ -146,6 +144,7 @@ extern void regenerate_key();
 extern void purge(void);
 extern void retry(void);
 extern int reload_configuration(void);
+extern void load_all_subnets();
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)