X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.h;h=817c2cb54549983b73e37650688ce2e8a02d3e4a;hb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;hp=2478c585423f383955b9c50336b231c966d6a1a2;hpb=03878f12150cbdb1aeb43e207404a0929a35ff13;p=tinc

diff --git a/src/conf.h b/src/conf.h
index 2478c585..817c2cb5 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,3 +1,6 @@
+#ifndef TINC_CONF_H
+#define TINC_CONF_H
+
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
@@ -18,9 +21,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
-
 #include "list.h"
 #include "splay_tree.h"
 #include "subnet.h"
@@ -43,7 +43,7 @@ extern list_t *cmdline_conf;
 
 extern void init_configuration(splay_tree_t **);
 extern void exit_configuration(splay_tree_t **);
-extern config_t *new_config(void) __attribute__ ((__malloc__));
+extern config_t *new_config(void) __attribute__((__malloc__));
 extern void free_config(config_t *);
 extern void config_add(splay_tree_t *, config_t *);
 extern config_t *lookup_config(splay_tree_t *, char *);
@@ -61,4 +61,4 @@ extern bool read_server_config(void);
 extern bool read_host_config(splay_tree_t *, const char *);
 extern bool append_config_file(const char *, const char *, const char *);
 
-#endif /* __TINC_CONF_H__ */
+#endif