X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.h;h=2478c585423f383955b9c50336b231c966d6a1a2;hp=20a78a917b8304c0d1d17297fd7b67afd3c1d229;hb=390d25f0b80dd7418e147de3561c70461628574d;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80

diff --git a/src/conf.h b/src/conf.h
index 20a78a91..2478c585 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -21,8 +21,9 @@
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
-#include "splay_tree.h"
 #include "list.h"
+#include "splay_tree.h"
+#include "subnet.h"
 
 typedef struct config_t {
 	char *variable;
@@ -31,7 +32,6 @@ typedef struct config_t {
 	int line;
 } config_t;
 
-#include "subnet.h"
 
 extern splay_tree_t *config_tree;
 
@@ -39,8 +39,6 @@ extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
 extern bool bypass_security;
-extern char *confbase;
-extern char *netname;
 extern list_t *cmdline_conf;
 
 extern void init_configuration(splay_tree_t **);