diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-12-07 23:42:19 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-12-07 23:42:19 +0000 |
| commit | 4408764e6991aa23e35d3a450898ee68059e827a (patch) | |
| tree | 9a5dd03ad65464b9482e8d5dab60f9f4796b99c3 /wiretap | |
| parent | 8b14380c28190360662634b96946c3a0b9c263f8 (diff) | |
HAVE_PCAP_H is no longer defined; just use HAVE_LIBPCAP.
Fix indentation.
svn path=/trunk/; revision=23798
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index ace86d1d78..29adc69308 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -34,11 +34,11 @@ #include "erf.h" #include "libpcap.h" -#ifdef HAVE_PCAP_H +#ifdef HAVE_LIBPCAP #include <pcap.h> #endif -#ifdef HAVE_PCAP_H +#ifdef HAVE_LIBPCAP # ifdef HAVE_SYS_TYPES_H # include <sys/types.h> # endif @@ -2265,7 +2265,7 @@ static int wtap_wtap_encap_to_pcap_encap(int encap) return -1; } -#ifdef HAVE_PCAP_H +#ifdef HAVE_LIBPCAP /* * Given a Wiretap encapsulation type, and raw packet data and the packet * header from libpcap, process any pseudo-header in the packet, @@ -2277,7 +2277,7 @@ wtap_process_pcap_packet(gint linktype, const struct pcap_pkthdr *phdr, const guchar *pd, union wtap_pseudo_header *pseudo_header, struct wtap_pkthdr *whdr, int *err) { - guint size; + guint size; /* "phdr->ts" may not necessarily be a "struct timeval" - it may be a "struct bpf_timeval", with member sizes wired to 32 |