From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 10 Apr 2013 23:13:33 +0000 (-0700)
Subject: Make the PCAP_DONT_INCLUDE_PCAP_BPF_H stuff BPF-only.
X-Git-Tag: libpcap-1.5.0~79
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/1effa26c5cd8bd723257e0fc07a30ee7307c3b11

Make the PCAP_DONT_INCLUDE_PCAP_BPF_H stuff BPF-only.

We don't need it on Linux and, in fact, it doesn't work on Linux, as
Linux doesn't define "struct bpf_program", libpcap does.
---

diff --git a/tests/valgrindtest.c b/tests/valgrindtest.c
index 9fd0a4e4..f74f8ea2 100644
--- a/tests/valgrindtest.c
+++ b/tests/valgrindtest.c
@@ -52,13 +52,9 @@ static const char rcsid[] _U_ =
 #endif
 
 #if defined(USE_BPF)
+
 #include <sys/ioctl.h>
 #include <net/bpf.h>
-#elif defined(USE_SOCKET_FILTERS)
-#include <sys/socket.h>
-#include <linux/types.h>
-#include <linux/filter.h>
-#endif
 
 /*
  * Make "pcap.h" not include "pcap/bpf.h"; we are going to include the
@@ -68,6 +64,14 @@ static const char rcsid[] _U_ =
  */
 #define PCAP_DONT_INCLUDE_PCAP_BPF_H
 
+#elif defined(USE_SOCKET_FILTERS)
+
+#include <sys/socket.h>
+#include <linux/types.h>
+#include <linux/filter.h>
+
+#endif
+
 #include <pcap.h>
 #ifndef HAVE___ATTRIBUTE__
 #define __attribute__(x)