"ipproto.h" uses "struct tok", and "interface.h" defines it; always

include "interface.h" before "ipproto.h".

diff --git a/ipproto.c b/ipproto.c
index 6144ebe70225fc7c43b469afefc53151dbf19757..c4731ad305ef9f967196099fcc2f1620fb8d28ae 100755 (executable)
--- a/ipproto.c
+++ b/ipproto.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/ipproto.c,v 1.3 2004-12-15 08:41:26 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/ipproto.c,v 1.3.2.1 2005-05-14 00:42:53 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -24,8 +24,8 @@ static const char rcsid[] _U_ =
 
 #include <tcpdump-stdinc.h>
 
-#include "ipproto.h"
 #include "interface.h"
+#include "ipproto.h"
 
 struct tok ipproto_values[] = {
     { IPPROTO_HOPOPTS, "Options" },

diff --git a/print-icmp6.c b/print-icmp6.c
index 08a298a2a9a45a124b6fe700b342bfd8e72f1df6..c615f39a3dbf939944b5ee90cdce41a4b0907912 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.79.2.3 2005-04-25 17:30:16 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.79.2.4 2005-05-14 00:42:54 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,14 +35,14 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 #include <string.h>
 
-#include "ip6.h"
-#include "icmp6.h"
-#include "ipproto.h"
-
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ip6.h"
+#include "icmp6.h"
+#include "ipproto.h"
+
 #include "udp.h"
 #include "ah.h"