From owner-svn-src-all@FreeBSD.ORG  Tue Mar 31 11:04:51 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 987071065675;
	Tue, 31 Mar 2009 11:04:51 +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 867AD8FC1C;
	Tue, 31 Mar 2009 11:04:51 +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 n2VB4pIr098281;
	Tue, 31 Mar 2009 11:04:51 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2VB4pHx098280;
	Tue, 31 Mar 2009 11:04:51 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200903311104.n2VB4pHx098280@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 31 Mar 2009 11:04:51 +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: r190591 - head/contrib/libpcap
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2009 11:04:52 -0000

Author: rpaulo
Date: Tue Mar 31 11:04:51 2009
New Revision: 190591
URL: http://svn.freebsd.org/changeset/base/190591

Log:
  Remove a dangling extern "C" declaration that was missed during the
  merge. Fixes C++ ports using libpcap (nmap, for example).
  
  Submitted by:	Daniel Roethlisberger <daniel at roe.ch>

Modified:
  head/contrib/libpcap/pcap.h

Modified: head/contrib/libpcap/pcap.h
==============================================================================
--- head/contrib/libpcap/pcap.h	Tue Mar 31 10:34:54 2009	(r190590)
+++ head/contrib/libpcap/pcap.h	Tue Mar 31 11:04:51 2009	(r190591)
@@ -53,10 +53,6 @@
 
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define PCAP_VERSION_MAJOR 2
 #define PCAP_VERSION_MINOR 4