diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-22 19:38:49 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-22 19:38:49 +0000 |
| commit | 4020fb9c391ffd6db845f9d2be9c9bcdaa1cc604 (patch) | |
| tree | dcdd73aab497bd2d1414e7df70e06c2b86687a00 | |
| parent | 1d23f6fd83fb70e257c4bb7b9a4faf086aded35f (diff) | |
| download | wireshark-4020fb9c391ffd6db845f9d2be9c9bcdaa1cc604.tar.gz wireshark-4020fb9c391ffd6db845f9d2be9c9bcdaa1cc604.tar.bz2 wireshark-4020fb9c391ffd6db845f9d2be9c9bcdaa1cc604.zip | |
Move wtap_pcap_encap_to_wtap_encap()'s definition to libpcap.h so packet-ppi.c can get access to it even when we don't HAVE_LIBPCAP (besides, it doesn't seem to be specific to capturing...)
svn path=/trunk/; revision=22591
| -rw-r--r-- | epan/dissectors/packet-ppi.c | 5 | ||||
| -rw-r--r-- | wiretap/libpcap.h | 1 | ||||
| -rw-r--r-- | wiretap/wtap-capture.h | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 6183fdc733..b6de2fbe5d 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -54,10 +54,7 @@ /* Needed for wtap_pcap_encap_to_wtap_encap(). Should we move it somewhere * else? */ -#ifdef HAVE_LIBPCAP -#include <pcap.h> -#endif -#include <wiretap/wtap-capture.h> +#include <wiretap/libpcap.h> #include "packet-frame.h" #include "packet-eth.h" diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h index 401cf343a7..7ade3e7132 100644 --- a/wiretap/libpcap.h +++ b/wiretap/libpcap.h @@ -101,5 +101,6 @@ 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 diff --git a/wiretap/wtap-capture.h b/wiretap/wtap-capture.h index 00a947b54f..9b69799882 100644 --- a/wiretap/wtap-capture.h +++ b/wiretap/wtap-capture.h @@ -24,7 +24,6 @@ #define __WTAP_CAPTURE_H__ /* XXX - needed until "wiretap" can do live packet captures */ -int wtap_pcap_encap_to_wtap_encap(int encap); const guchar *wtap_process_pcap_packet(gint linktype, const struct pcap_pkthdr *phdr, const guchar *pd, union wtap_pseudo_header *pseudo_header, struct wtap_pkthdr *whdr, |