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 /wiretap/libpcap.h | |
| parent | add4e4dfbd7ea5bd6f5e435413633605c627a0f7 (diff) | |
| download | wireshark-c85899e946cf25597d3bd1328632bbb5c5456012.tar.gz | |
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 'wiretap/libpcap.h')
| -rw-r--r-- | wiretap/libpcap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h index 7ade3e7132..401cf343a7 100644 --- a/wiretap/libpcap.h +++ b/wiretap/libpcap.h @@ -101,6 +101,5 @@ struct pcaprec_nokia_hdr { int libpcap_open(wtap *wth, int *err, gchar **err_info); gboolean libpcap_dump_open(wtap_dumper *wdh, gboolean cant_seek, int *err); int libpcap_dump_can_write_encap(int encap); -int wtap_pcap_encap_to_wtap_encap(int encap); #endif |