diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 32f96ef2ee40..b4556b476b94 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20170307: remove pcap-int.h +OLD_FILES+=usr/include/pcap-int.h # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0. OLD_FILES+=usr/include/c++/v1/__undef___deallocate OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index b83c5f1e4beb..e402e7ffea58 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -14,7 +14,7 @@ SRCS= grammar.y tokdefs.h pcap_version.h pcap-bpf.c \ scanner.l sf-pcap.c sf-pcap-ng.c version.c # Old compatibility headers -INCS= pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h +INCS= pcap.h pcap-namedb.h pcap-bpf.h PCAPINCS= pcap/pcap.h pcap/namedb.h pcap/bpf.h pcap/dlt.h pcap/export-defs.h PCAPINCSDIR= ${INCLUDEDIR}/pcap