From owner-svn-src-head@freebsd.org Sun Jul 1 18:58:55 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1125CFD45AB; Sun, 1 Jul 2018 18:58:55 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A4AB07987A; Sun, 1 Jul 2018 18:58:54 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 808AC22A03; Sun, 1 Jul 2018 18:58:54 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w61Iwsd3051657; Sun, 1 Jul 2018 18:58:54 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w61IwsmG051656; Sun, 1 Jul 2018 18:58:54 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201807011858.w61IwsmG051656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sun, 1 Jul 2018 18:58:54 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: in head/lib: libcapsicum libcasper/libcasper X-SVN-Commit-Revision: 335848 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jul 2018 18:58:55 -0000 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_ */