Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Jul 2018 18:58:54 +0000 (UTC)
From:      Mariusz Zaborski <oshogbo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r335848 - in head/lib: libcapsicum libcasper/libcasper
Message-ID:  <201807011858.w61IwsmG051656@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oshogbo
Date: Sun Jul  1 18:58:53 2018
New Revision: 335848
URL: https://svnweb.freebsd.org/changeset/base/335848

Log:
  With r335636 C++ program use libcasper.h and capsicum_helpers.h.
  Add __BEGIN_DECLS and __END_DECLS to those headers.

Modified:
  head/lib/libcapsicum/capsicum_helpers.h
  head/lib/libcasper/libcasper/libcasper.h

Modified: head/lib/libcapsicum/capsicum_helpers.h
==============================================================================
--- head/lib/libcapsicum/capsicum_helpers.h	Sun Jul  1 18:09:16 2018	(r335847)
+++ head/lib/libcapsicum/capsicum_helpers.h	Sun Jul  1 18:58:53 2018	(r335848)
@@ -46,6 +46,8 @@
 #define	CAPH_WRITE		0x0004
 #define	CAPH_LOOKUP		0x0008
 
+__BEGIN_DECLS
+
 static __inline int
 caph_limit_stream(int fd, int flags)
 {
@@ -141,5 +143,7 @@ caph_enter_casper(void)
 
 	return (CASPER_SUPPORT == 0 ? 0 : caph_enter());
 }
+
+__END_DECLS
 
 #endif /* _CAPSICUM_HELPERS_H_ */

Modified: head/lib/libcasper/libcasper/libcasper.h
==============================================================================
--- head/lib/libcasper/libcasper/libcasper.h	Sun Jul  1 18:09:16 2018	(r335847)
+++ head/lib/libcasper/libcasper/libcasper.h	Sun Jul  1 18:58:53 2018	(r335848)
@@ -71,6 +71,8 @@ typedef struct cap_channel cap_channel_t;
 #endif /* ! WITH_CASPER */
 #endif /* ! _CAP_CHANNEL_T_DECLARED */
 
+__BEGIN_DECLS
+
 #ifdef WITH_CASPER
 int cap_channel_flags(const cap_channel_t *chan);
 #else
@@ -278,5 +280,7 @@ cap_xfer_nvlist(const cap_channel_t *chan, nvlist_t *n
 	return (nvlist_create(channel_nvlist_flags(chan)));
 }
 #endif
+
+__END_DECLS
 
 #endif	/* !_LIBCASPER_H_ */



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