From dbeb92f5cc4f9d2ac4d334e4d2a7d9a5f6c1a7b9 Mon Sep 17 00:00:00 2001 From: Ryan Stone Date: Fri, 23 May 2014 20:06:04 -0400 Subject: [PATCH 01/17] Make libnv headers includable from C++ --- lib/libnv/dnv.h | 4 ++++ lib/libnv/nv.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lib/libnv/dnv.h b/lib/libnv/dnv.h index ac1e57c..dd1d831 100644 --- a/lib/libnv/dnv.h +++ b/lib/libnv/dnv.h @@ -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 *nvl, nvlist_t *defval, const char *name 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_ */ diff --git a/lib/libnv/nv.h b/lib/libnv/nv.h index e2d7030..9bd438f 100644 --- a/lib/libnv/nv.h +++ b/lib/libnv/nv.h @@ -63,6 +63,7 @@ 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); @@ -270,4 +271,6 @@ void nvlist_freev_nvlist(nvlist_t *nvl, const char *namefmt, va_list nameap) __p 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_ */ -- 1.9.2