From: Denis Ovsienko <denis@ovsienko.info>
Date: Sun, 12 Mar 2017 10:00:52 +0000 (+0000)
Subject: Fix Linux/GCC build after the previous commit.
X-Git-Tag: tcpdump-4.99-bp~1924
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/95cb8ad87a7c6dbf726e5b0256b9e484d208fda5

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 db4a98ed..03836adb 100644
--- 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 4c16d802..14768deb 100644
--- 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 d3ca0cab..16d3f7c2 100644
--- 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 */