Don't use "struct netdissect_options" in interface.h.

Use it in netdissect.h, where it's defined; otherwise, we get a bunch of
warnings when compiling modules that include interface.h but don't yet
include netdissect.h.

diff --git a/interface.h b/interface.h
index 075b78fe41a23ea7f9173281487cf89a4454a9db..1ea322eddb085032ea4ec948b898f6629686b6e7 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -97,14 +97,6 @@ extern char *program_name;   /* used to generate self-identifying messages */
 
 extern int32_t thiszone;       /* seconds offset from gmt to local time */
 
 
 extern int32_t thiszone;       /* seconds offset from gmt to local time */
 

-typedef u_int (*if_ndo_printer)(struct netdissect_options *ndo,
-                               const struct pcap_pkthdr *, const u_char *);
-typedef u_int (*if_printer)(const struct pcap_pkthdr *, const u_char *);
-
-extern if_ndo_printer lookup_ndo_printer(int);
-extern if_printer lookup_printer(int);
-
-

 /*
  * True if  "l" bytes of "var" were captured.
  *
 /*
  * True if  "l" bytes of "var" were captured.
  *

diff --git a/netdissect.h b/netdissect.h
index 48ff2b20f53527635526002cde96897269bcd3c6..19d3394eeaa771115c3d644f775a23cc13600cfa 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -268,6 +268,12 @@ extern const char *dnnum_string(netdissect_options *, u_short);
 
 #include <pcap.h>
 
 
 #include <pcap.h>
 

+typedef u_int (*if_ndo_printer)(struct netdissect_options *ndo,
+                               const struct pcap_pkthdr *, const u_char *);
+typedef u_int (*if_printer)(const struct pcap_pkthdr *, const u_char *);
+
+extern if_ndo_printer lookup_ndo_printer(int);
+extern if_printer lookup_printer(int);

 
 extern void eap_print(netdissect_options *,const u_char *, u_int);
 extern int esp_print(netdissect_options *,
 
 extern void eap_print(netdissect_options *,const u_char *, u_int);
 extern int esp_print(netdissect_options *,