From owner-svn-src-head@FreeBSD.ORG  Thu Apr  2 13:04:17 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C84C5106564A;
	Thu,  2 Apr 2009 13:04:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B65818FC1C;
	Thu,  2 Apr 2009 13:04:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n32D4HtM065564;
	Thu, 2 Apr 2009 13:04:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n32D4H8v065562;
	Thu, 2 Apr 2009 13:04:17 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904021304.n32D4H8v065562@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 2 Apr 2009 13:04:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190640 - in head/contrib/libpcap: . pcap
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Apr 2009 13:04:18 -0000

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>