From nobody Wed Sep 10 04:31:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cM77P1gdqz66wF6; Wed, 10 Sep 2025 04:31:45 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cM77N1jlpz47Jr; Wed, 10 Sep 2025 04:31:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 58A4VTgM000090; Wed, 10 Sep 2025 07:31:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 58A4VTgM000090 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 58A4VTgq000089; Wed, 10 Sep 2025 07:31:29 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 10 Sep 2025 07:31:29 +0300 From: Konstantin Belousov To: Ka Ho Ng Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 11ace56fa030 - main - contrib/libxo: fix API header files inclusions in C++ source files Message-ID: References: <202509071842.587IgHbm001636@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202509071842.587IgHbm001636@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; ARC_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; HAS_XAW(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4cM77N1jlpz47Jr On Sun, Sep 07, 2025 at 06:42:17PM +0000, Ka Ho Ng wrote: > The branch main has been updated by khng: > > URL: https://cgit.FreeBSD.org/src/commit/?id=11ace56fa030185025936c795d5cf7c57b266835 > > commit 11ace56fa030185025936c795d5cf7c57b266835 > Author: ShengYi Hung > AuthorDate: 2025-09-07 18:33:01 +0000 > Commit: Ka Ho Ng > CommitDate: 2025-09-07 18:33:01 +0000 > > contrib/libxo: fix API header files inclusions in C++ source files > > C++ source files need `extern "C"` to disable C++ name mangling. > > MFC after: 1 week > Reviewed by: aokblast (previous version), phil, imp (previous version) > Differential Revision: https://reviews.freebsd.org/D47930 > --- > contrib/libxo/libxo/xo.h | 8 ++++++++ > contrib/libxo/libxo/xo_encoder.h | 8 ++++++++ > 2 files changed, 16 insertions(+) > > diff --git a/contrib/libxo/libxo/xo.h b/contrib/libxo/libxo/xo.h > index 6a61a16c7cae..7f37b469b54e 100644 > --- a/contrib/libxo/libxo/xo.h > +++ b/contrib/libxo/libxo/xo.h > @@ -27,6 +27,10 @@ > #include > #include > > +#ifdef __cplusplus > +extern "C" { > +#endif /* __cplusplus */ > + > #ifdef __dead2 > #define NORETURN __dead2 > #else > @@ -699,4 +703,8 @@ xo_retain_clear_all (void); > void > xo_retain_clear (const char *fmt); > > +#ifdef __cplusplus > +} > +#endif /* __cplusplus */ > + > #endif /* INCLUDE_XO_H */ > diff --git a/contrib/libxo/libxo/xo_encoder.h b/contrib/libxo/libxo/xo_encoder.h > index 099248ae13a6..bb57194ab030 100644 > --- a/contrib/libxo/libxo/xo_encoder.h > +++ b/contrib/libxo/libxo/xo_encoder.h > @@ -20,6 +20,10 @@ > > #include > > +#ifdef __cplusplus > +extern "C" { > +#endif /* __cplusplus */ > + > /* > * Expose libxo's memory allocation functions > */ > @@ -167,4 +171,8 @@ xo_encoder_op_name (xo_encoder_op_t op); > void > xo_failure (xo_handle_t *xop, const char *fmt, ...); > > +#ifdef __cplusplus > +} > +#endif /* __cplusplus */ > + > #endif /* XO_ENCODER_H */ Would it be better to use __BEGIN_DECLS? I am not completely sure due to contrib/, but libxo is FreeBSD-specific enough already.