Fix Linux/GCC build after the previous commit.

ip6.h now needs netdissect.h, fix includes order where required to fix:

./ip6.h:181:2: error: unknown type name ‘nd_uint8_t’
  nd_uint8_t  ip6r0_nxt;  /* next header */
  ^
./ip6.h:182:2: error: unknown type name ‘nd_uint8_t’
  nd_uint8_t  ip6r0_len;  /* length in units of 8 octets */
  ^
./ip6.h:183:2: error: unknown type name ‘nd_uint8_t’
  nd_uint8_t  ip6r0_type;  /* always zero */
  ^
./ip6.h:184:2: error: unknown type name ‘nd_uint8_t’
  nd_uint8_t  ip6r0_segleft; /* segments left */
  ^
./ip6.h:185:2: error: unknown type name ‘nd_uint32_t’
  nd_uint32_t ip6r0_reserved; /* reserved field */
  ^

diff --git a/print-frag6.c b/print-frag6.c
index db4a98edcc3e40bb09bbb2a9cfe7917dac4d113a..03836adbb2d49d025753f901876ee358dd9c23f5 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -27,10 +27,11 @@
 
 #include <netdissect-stdinc.h>
 
-#include "ip6.h"
 #include "netdissect.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 int
 frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
 {

diff --git a/print-ip6opts.c b/print-ip6opts.c
index 4c16d80221294f5d2a1e812d6bfb2d05df9fb5e6..14768deb3795ce01dc9d2a5b2d1822d7a8004f4c 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -35,12 +35,12 @@
 
 #include <netdissect-stdinc.h>
 
-#include "ip6.h"
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 static void
 ip6_sopt_print(netdissect_options *ndo, const u_char *bp, int len)
 {

diff --git a/print-mobility.c b/print-mobility.c
index 8cb32c18a0da8a89e757f44ffe45344c38b3fb5f..7a12901f8fffa639550f868189e90415805bc2b6 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -36,11 +36,12 @@
 
 #include <netdissect-stdinc.h>
 
-#include "ip6.h"
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 static const char tstr[] = "[|MOBILITY]";
 
 /* Mobility header */