Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Mar 2015 00:01:37 +0000 (UTC)
From:      Ryan Stone <rstone@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r279421 - head/lib/libnv
Message-ID:  <201503010001.t2101bu7072355@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rstone
Date: Sun Mar  1 00:01:36 2015
New Revision: 279421
URL: https://svnweb.freebsd.org/changeset/base/279421

Log:
  Make libnv headers includable from C++
  
  Differential Revision:		https://reviews.freebsd.org/D1868
  Reviewed by:			jfv, pjd
  MFC after:			1 month
  Sponsored by:			Sandvine Inc.

Modified:
  head/lib/libnv/dnv.h
  head/lib/libnv/nv.h

Modified: head/lib/libnv/dnv.h
==============================================================================
--- head/lib/libnv/dnv.h	Sat Feb 28 23:59:29 2015	(r279420)
+++ head/lib/libnv/dnv.h	Sun Mar  1 00:01:36 2015	(r279421)
@@ -45,6 +45,8 @@ struct nvlist;
 typedef struct nvlist nvlist_t;
 #endif
 
+__BEGIN_DECLS
+
 /*
  * The dnvlist_get functions returns value associated with the given name.
  * If it returns a pointer, the pointer represents internal buffer and should
@@ -103,4 +105,6 @@ nvlist_t *dnvlist_takev_nvlist(nvlist_t 
 int dnvlist_takev_descriptor(nvlist_t *nvl, int defval, const char *namefmt, va_list nameap) __printflike(3, 0);
 void *dnvlist_takev_binary(nvlist_t *nvl, size_t *sizep, void *defval, size_t defsize, const char *namefmt, va_list nameap) __printflike(5, 0);
 
+__END_DECLS
+
 #endif	/* !_DNV_H_ */

Modified: head/lib/libnv/nv.h
==============================================================================
--- head/lib/libnv/nv.h	Sat Feb 28 23:59:29 2015	(r279420)
+++ head/lib/libnv/nv.h	Sun Mar  1 00:01:36 2015	(r279421)
@@ -63,6 +63,8 @@ typedef struct nvlist nvlist_t;
  */
 #define	NV_FLAG_IGNORE_CASE		0x01
 
+__BEGIN_DECLS
+
 nvlist_t	*nvlist_create(int flags);
 void		 nvlist_destroy(nvlist_t *nvl);
 int		 nvlist_error(const nvlist_t *nvl);
@@ -272,4 +274,6 @@ void nvlist_freev_nvlist(nvlist_t *nvl, 
 void nvlist_freev_descriptor(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
 void nvlist_freev_binary(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
 
+__END_DECLS
+
 #endif	/* !_NV_H_ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503010001.t2101bu7072355>