Include "netdissect.h" in print-ip6.c, and move icmp6_print's

declaration out from inside #if 0/#endif, to get it declared in
print-ip6.c.

diff --git a/netdissect.h b/netdissect.h
index f7a7ac43fd4fc483c5bce4e072b669e1f7a49f8d..dd9f4b966bfd87ff12cd80558f1dabafa6e41308 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -274,6 +274,8 @@ extern int esp_print(netdissect_options *,
                     register const u_char *bp, int len, register const u_char *bp2,
                     int *nhdr, int *padlen);
 extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);
                     register const u_char *bp, int len, register const u_char *bp2,
                     int *nhdr, int *padlen);
 extern void arp_print(netdissect_options *,const u_char *, u_int, u_int);

+extern void icmp6_print(netdissect_options *ndo, const u_char *,
+                        u_int, const u_char *, int);

 extern void isakmp_print(netdissect_options *,const u_char *,
                         u_int, const u_char *);
 extern void isakmp_rfc3948_print(netdissect_options *,const u_char *,
 extern void isakmp_print(netdissect_options *,const u_char *,
                         u_int, const u_char *);
 extern void isakmp_rfc3948_print(netdissect_options *,const u_char *,


@@ -329,8 +331,6 @@ extern void fddi_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
 extern void gre_print(netdissect_options *,const u_char *, u_int);
 extern void icmp_print(netdissect_options *,const u_char *, u_int,
                       const u_char *);
 extern void gre_print(netdissect_options *,const u_char *, u_int);
 extern void icmp_print(netdissect_options *,const u_char *, u_int,
                       const u_char *);

-extern void icmp6_print(netdissect_options *ndo, const u_char *,
-                        u_int, const u_char *, int);

 extern void hsrp_print(netdissect_options *ndo,
                       register const u_char *bp, register u_int len);
 extern void ieee802_11_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);
 extern void hsrp_print(netdissect_options *ndo,
                       register const u_char *bp, register u_int len);
 extern void ieee802_11_if_print(u_char *,const struct pcap_pkthdr *, const u_char *);

diff --git a/print-ip6.c b/print-ip6.c
index f7bd50eaac94cc9a1c17950b52a30e7068f3fd9b..1599cf28b60f90ff153277c23449d2fa88c2f942 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -36,6 +36,7 @@ static const char rcsid[] _U_ =
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#include "netdissect.h"

 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"