Fix placement of #include "config.h"

diff --git a/lib/utils.c b/lib/utils.c
index 3b1abc3..79e3208 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -18,12 +18,12 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 

+#include "config.h"
+

 #include <sys/types.h>
 #include <ctype.h>
 #include <string.h>
 
 #include <sys/types.h>
 #include <ctype.h>
 #include <string.h>
 

-#include "config.h"
-

 #include <utils.h>
 #include <syslog.h>
 #include <xalloc.h>
 #include <utils.h>
 #include <syslog.h>
 #include <xalloc.h>

diff --git a/src/connection.c b/src/connection.c
index a35d4f0..b9a3c23 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: connection.c,v 1.1.2.34 2002/09/09 22:32:30 guus Exp $
+    $Id: connection.c,v 1.1.2.35 2002/09/10 22:12:33 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -32,7 +32,6 @@
 
 #include "net.h"                               /* Don't ask. */
 #include "netutl.h"
 
 #include "net.h"                               /* Don't ask. */
 #include "netutl.h"

-#include "config.h"

 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"
 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"

diff --git a/src/edge.c b/src/edge.c
index 9cc9df8..0a47f8c 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: edge.c,v 1.1.2.17 2002/09/09 22:32:30 guus Exp $
+    $Id: edge.c,v 1.1.2.18 2002/09/10 22:12:33 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -31,7 +31,6 @@
 
 #include "net.h"                               /* Don't ask. */
 #include "netutl.h"
 
 #include "net.h"                               /* Don't ask. */
 #include "netutl.h"

-#include "config.h"

 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"
 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"

diff --git a/src/graph.c b/src/graph.c
index feb9d00..b7c285f 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: graph.c,v 1.1.2.20 2002/09/10 09:40:21 guus Exp $
+    $Id: graph.c,v 1.1.2.21 2002/09/10 22:12:33 guus Exp $

 */
 
 /* We need to generate two trees from the graph:
 */
 
 /* We need to generate two trees from the graph:


@@ -48,7 +48,6 @@
 
 #include <stdio.h>
 #include <syslog.h>
 
 #include <stdio.h>
 #include <syslog.h>

-#include "config.h"

 #include <string.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #include <string.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>

diff --git a/src/net.h b/src/net.h
index 08b0aea..490cdcf 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -17,12 +17,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: net.h,v 1.9.4.53 2002/09/09 21:24:36 guus Exp $
+    $Id: net.h,v 1.9.4.54 2002/09/10 22:12:33 guus Exp $

 */
 
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 
 */
 
 #ifndef __TINC_NET_H__
 #define __TINC_NET_H__
 

+#include "config.h"
+

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>


@@ -32,8 +34,6 @@
 #include <inttypes.h>
 #endif
 
 #include <inttypes.h>
 #endif
 

-#include "config.h"
-

 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014                               /* 9000 bytes payload + 14 bytes ethernet header */
 #define MAXSIZE 9100                   /* MTU + header (seqno) and trailer (CBC padding and HMAC) */
 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014                               /* 9000 bytes payload + 14 bytes ethernet header */
 #define MAXSIZE 9100                   /* MTU + header (seqno) and trailer (CBC padding and HMAC) */