Upgrade libpcap to libpcap-1.10.1
Test: make
Change-Id: I71fbaf023c661441852a3a3ed18b935fee111fa2
diff --git a/pcap-int.h b/pcap-int.h
index 3c18dae..dc18d50 100644
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -40,9 +40,18 @@
#include <pcap/pcap.h>
+#ifdef MSDOS
+ #include <fcntl.h>
+ #include <io.h>
+#endif
+
#include "varattrs.h"
#include "fmtutils.h"
+#include <stdarg.h>
+
+#include "portability.h"
+
/*
* Version string.
* Uses PACKAGE_VERSION from config.h.
@@ -80,11 +89,6 @@
*/
extern int pcap_utf_8_mode;
-#ifdef MSDOS
- #include <fcntl.h>
- #include <io.h>
-#endif
-
/*
* Swap byte ordering of unsigned long long timestamp on a big endian
* machine.
@@ -433,10 +437,6 @@
int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
-#include <stdarg.h>
-
-#include "portability.h"
-
/*
* Does the packet count argument to a module's read routine say
* "supply packets until you run out of packets"?
@@ -592,7 +592,7 @@
* Linux kernel when the kernel rejects the filter (requiring us to
* run it in userland). It contains VLAN tag information.
*/
-struct bpf_aux_data {
+struct pcap_bpf_aux_data {
u_short vlan_tag_present;
u_short vlan_tag;
};
@@ -602,7 +602,7 @@
* argument.
*/
u_int pcap_filter_with_aux_data(const struct bpf_insn *,
- const u_char *, u_int, u_int, const struct bpf_aux_data *);
+ const u_char *, u_int, u_int, const struct pcap_bpf_aux_data *);
/*
* Filtering routine that doesn't.