diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-02-23 03:50:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-02-23 03:50:42 +0000 |
| commit | c85899e946cf25597d3bd1328632bbb5c5456012 (patch) | |
| tree | 864989b98b67999c070743fbddc217c37a99e1f8 /rawshark.c | |
| parent | add4e4dfbd7ea5bd6f5e435413633605c627a0f7 (diff) | |
Move the declarations of wtap_pcap_encap_to_wtap_encap() and
wtap_wtap_encap_to_pcap_encap() to wiretap/pcap-encap.h. Include it
where it's needed; don't include other Wiretap headers where they're not
needed.
Include pcapng.h in pcapng.c, to declare the functions defined in
pcapng.c. Add some casts to squelch some warnings, and add to a comment
to indicate one of the problems.
svn path=/trunk/; revision=31960
Diffstat (limited to 'rawshark.c')
| -rw-r--r-- | rawshark.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rawshark.c b/rawshark.c index 19b1c6dea7..573a659010 100644 --- a/rawshark.c +++ b/rawshark.c @@ -102,8 +102,9 @@ #include "epan/proto.h" #include <epan/tap.h> -#include <wtap.h> -#include <libpcap.h> +#include <wiretap/wtap.h> +#include <wiretap/libpcap.h> +#include <wiretap/pcap-encap.h> #ifdef HAVE_LIBPCAP #include <pcap.h> |