svn commit: r192248 - stable/7/lib/libpmc

[Fabien Thomas]

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