svn commit: r190640 - in head/contrib/libpcap: . pcap

[Rui Paulo]

Author: rpaulo
Date: Thu Apr  2 13:04:17 2009
New Revision: 190640
URL: http://svn.freebsd.org/changeset/base/190640

Log:
  Restore local change to include <sys/bpf.h> inside pcap.h. This fixes
  remaining ports build problems.

Modified:
  head/contrib/libpcap/pcap.h
  head/contrib/libpcap/pcap/pcap.h

Modified: head/contrib/libpcap/pcap.h
==============================================================================
--- head/contrib/libpcap/pcap.h	Thu Apr  2 13:02:12 2009	(r190639)
+++ head/contrib/libpcap/pcap.h	Thu Apr  2 13:04:17 2009	(r190640)
@@ -47,9 +47,7 @@
   #include <sys/time.h>
 #endif /* WIN32/MSDOS/UN*X */
 
-#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
-#include <pcap-bpf.h>
-#endif
+#include <net/bpf.h>
 
 #include <stdio.h>
 

Modified: head/contrib/libpcap/pcap/pcap.h
==============================================================================
--- head/contrib/libpcap/pcap/pcap.h	Thu Apr  2 13:02:12 2009	(r190639)
+++ head/contrib/libpcap/pcap/pcap.h	Thu Apr  2 13:04:17 2009	(r190640)
@@ -47,9 +47,7 @@
   #include <sys/time.h>
 #endif /* WIN32/MSDOS/UN*X */
 
-#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H
-#include <pcap/bpf.h>
-#endif
+#include <net/bpf.h>
 
 #include <stdio.h>