From owner-svn-src-head@FreeBSD.ORG  Sun Mar 22 00:47:42 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 31153106564A;
	Sun, 22 Mar 2009 00:47:42 +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 1FB568FC15;
	Sun, 22 Mar 2009 00:47:42 +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 n2M0lgS3052097;
	Sun, 22 Mar 2009 00:47:42 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2M0lfjA052096;
	Sun, 22 Mar 2009 00:47:42 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200903220047.n2M0lfjA052096@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 22 Mar 2009 00:47:41 +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: r190234 - 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: Sun, 22 Mar 2009 00:47:42 -0000

Author: rpaulo
Date: Sun Mar 22 00:47:41 2009
New Revision: 190234
URL: http://svn.freebsd.org/changeset/base/190234

Log:
  bpf_filter() and bpf_validate() can't live here if they already live in
  bpf.h

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

Modified: head/contrib/libpcap/pcap/pcap.h
==============================================================================
--- head/contrib/libpcap/pcap/pcap.h	Sun Mar 22 00:45:47 2009	(r190233)
+++ head/contrib/libpcap/pcap/pcap.h	Sun Mar 22 00:47:41 2009	(r190234)
@@ -336,8 +336,8 @@ void	pcap_freealldevs(pcap_if_t *);
 const char *pcap_lib_version(void);
 
 /* XXX this guy lives in the bpf tree */
-u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
-int	bpf_validate(const struct bpf_insn *f, int len);
+/* u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); 
+int	bpf_validate(const struct bpf_insn *f, int len); */
 char	*bpf_image(const struct bpf_insn *, int);
 void	bpf_dump(const struct bpf_program *, int);