From owner-svn-src-stable@FreeBSD.ORG  Sun May 17 11:45:38 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DA1410656C3;
	Sun, 17 May 2009 11:45:38 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EE5A98FC12;
	Sun, 17 May 2009 11:45:37 +0000 (UTC)
	(envelope-from fabient@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 n4HBjbDX026988;
	Sun, 17 May 2009 11:45:37 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4HBjbQC026986;
	Sun, 17 May 2009 11:45:37 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <200905171145.n4HBjbQC026986@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Sun, 17 May 2009 11:45:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192248 - stable/7/lib/libpmc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 May 2009 11:45:39 -0000

Author: fabient
Date: Sun May 17 11:45:37 2009
New Revision: 192248
URL: http://svn.freebsd.org/changeset/base/192248

Log:
  MFC 190395: Allow compile from c++ for libpmc
  
  Reviewed by: jkoshy (mentor)

Modified:
  stable/7/lib/libpmc/   (props changed)
  stable/7/lib/libpmc/pmc.h
  stable/7/lib/libpmc/pmclog.h

Modified: stable/7/lib/libpmc/pmc.h
==============================================================================
--- stable/7/lib/libpmc/pmc.h	Sun May 17 10:58:50 2009	(r192247)
+++ stable/7/lib/libpmc/pmc.h	Sun May 17 11:45:37 2009	(r192248)
@@ -29,6 +29,7 @@
 #ifndef _PMC_H_
 #define _PMC_H_
 
+#include <sys/cdefs.h>
 #include <sys/pmc.h>
 
 /*
@@ -68,6 +69,7 @@ struct pmc_pmcinfo {
  * Prototypes
  */
 
+__BEGIN_DECLS
 int	pmc_allocate(const char *_ctrspec, enum pmc_mode _mode, uint32_t _flags,
     int _cpu, pmc_id_t *_pmcid);
 int	pmc_attach(pmc_id_t _pmcid, pid_t _pid);
@@ -105,5 +107,6 @@ const char	*pmc_name_of_state(enum pmc_s
 
 int	pmc_event_names_of_class(enum pmc_class _cl, const char ***_eventnames,
     int *_nevents);
+__END_DECLS
 
 #endif

Modified: stable/7/lib/libpmc/pmclog.h
==============================================================================
--- stable/7/lib/libpmc/pmclog.h	Sun May 17 10:58:50 2009	(r192247)
+++ stable/7/lib/libpmc/pmclog.h	Sun May 17 11:45:37 2009	(r192248)
@@ -29,6 +29,7 @@
 #ifndef	_PMCLOG_H_
 #define	_PMCLOG_H_
 
+#include <sys/cdefs.h>
 #include <sys/pmclog.h>
 
 enum pmclog_state {
@@ -145,10 +146,12 @@ struct pmclog_ev {
 
 #define	PMCLOG_FD_NONE				(-1)
 
+__BEGIN_DECLS
 void	*pmclog_open(int _fd);
 int	pmclog_feed(void *_cookie, char *_data, int _len);
 int	pmclog_read(void *_cookie, struct pmclog_ev *_ev);
 void	pmclog_close(void *_cookie);
+__END_DECLS
 
 #endif