Merge branch 'master' into 1.1

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index cd97e30..f53c27a 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -114,6 +114,8 @@ extern int listen_sockets;
 extern int keylifetime;
 extern bool do_prune;
 extern char *myport;
+extern int contradicting_add_edge;
+extern int contradicting_del_edge;
 
 /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 #include "connection.h"