Page MenuHomeFreeBSD
Files F164867614

D38575.id117321.diff
No OneTemporary
Actions

D38575.id117321.diff
View Options

diff --git a/contrib/libpcap/pcap/bpf.h b/contrib/libpcap/pcap/bpf.h
--- a/contrib/libpcap/pcap/bpf.h
+++ b/contrib/libpcap/pcap/bpf.h
@@ -74,6 +74,9 @@
extern "C" {
#endif
+#if defined(__FreeBSD__)
+#include <net/bpf.h>
+#else
/* BSD style release date */
#define BPF_RELEASE 199606
@@ -256,4 +259,5 @@
}
#endif
+#endif /* defined(__FreeBSD__) */
#endif /* !defined(_NET_BPF_H_) && !defined(_BPF_H_) && !defined(_H_BPF) && !defined(lib_pcap_bpf_h) */
diff --git a/contrib/libpcap/pcap/pcap.h b/contrib/libpcap/pcap/pcap.h
--- a/contrib/libpcap/pcap/pcap.h
+++ b/contrib/libpcap/pcap/pcap.h
@@ -85,7 +85,10 @@
#endif /* _WIN32/MSDOS/UN*X */
#include <pcap/socket.h> /* for SOCKET, as the active-mode rpcap APIs use it */
-#include <net/bpf.h>
+
+#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
+#include <pcap/bpf.h>
+#endif
#include <stdio.h>

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 5, 9:22 AM (1 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36028091
Default Alt Text
D38575.id117321.diff (856 B)

Event Timeline