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/pcap-common.h | |
| 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 'wiretap/pcap-common.h')
| -rw-r--r-- | wiretap/pcap-common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/wiretap/pcap-common.h b/wiretap/pcap-common.h index cf4f81ed1e..60762abe77 100644 --- a/wiretap/pcap-common.h +++ b/wiretap/pcap-common.h @@ -24,8 +24,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -extern int wtap_wtap_encap_to_pcap_encap(int encap); - extern int pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, gboolean byte_swapped, guint packet_size, gboolean check_packet_size, struct wtap_pkthdr *phdr, |