From nobody Sun Sep 14 00:31:18 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 4cPTc62lkXz67lYm; Sun, 14 Sep 2025 00:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPTc62CTZz400q; Sun, 14 Sep 2025 00:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757809878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KdK+0gzLBXO3myYgQS+0LEd3pEcv/1JnGBDu6TR3Q4E=; b=c1Cpv8Hgv1+lWKpAITTB6VuWvqk9mjEsa2zP7gX1WgKguOl3EwNyxGO6d30QGmBygwHMvX 0aBB2q6iW7zKlkKYcNq9dbKBkbaB8z8ADGcCyiV7jY16TCvdSth7zWmuUHmMYZEsxidBY0 J8lYs/YXOWZEwh5x88Uy/bm0zmZX0u2sD4BCxQeaq1eLH9f+WDKrtKET9RKifoe4CjWw9/ 3YnetFy8mRaishC9JDTzaYwQs6NzxgVkYr2SGS9pYfbkSIKKEBQW4fq1jS+FkGTY72nxjO /ImwJGw2whG4lDd7RcfiY7XILOzlkwK9Fi9hUFgZH3TYc8HJOyeHYdwQhwjeSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757809878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KdK+0gzLBXO3myYgQS+0LEd3pEcv/1JnGBDu6TR3Q4E=; b=jQEsGfYFaBzftCeiGnOU1DkCPjpwympWPH1s8JqYGfXp4zvVeBAwI7WqDk8rqfo5PvyWun ktI8B6P8hSgMEf6JZLUHi7bSiL8cuMPSHqAo+CVA2sC/r0SYjrfxpGJmno6TTcwCfTLp0n 8Ziz5qeTi9Q1i6dddbdwzeAmSaOVtH/h82g14sOJyUevsCOwih7yKeVg0RFdfuClYsWnq4 pMumsHehKjFQAaeonTcmSzkBAvgjUMqB4XShYvDZEwZ2SfQ2ilSpFer5ijrJ8T9pRyiXvv E+iY+8sgUhxLkQrdc/yUrDxshPTlfd1C9GxXf1lmXrRcmhXlgz8PvzOpgah+Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757809878; a=rsa-sha256; cv=none; b=tDg4ZgxEQ9Y+T/7pSCTGujyAYUByucpidX6XcE9HTjzmzpCC7S1xCalMMPv+/0fg0WI1Iz Fg/cN440JNV//uE3GDZq21IO2biyRn4W/nQ9s+N8ZsUsYQOuLON2EtFlwU/B4HddNlXUFN VsfuWsl2I+ImiVy8M991bQSk+O0iNMRQ1z/+NR/975KX0TlMOvj62DlUBTqq06zIz9LpHk kAP8zdNTs0Waf42dSVJBdcDy5rPv5r9cVFElvCz0mQhDaOCxDbeU0zbJ/DgjvyHzhbVTRO TUBMMSqRgblWfIzYjpW1fKldDrBFZHaVPGf2fGW8Qdz5IznqREvFFYKn8AGzEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cPTc61ksLz11v7; Sun, 14 Sep 2025 00:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58E0VIo0044660; Sun, 14 Sep 2025 00:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58E0VIYo044657; Sun, 14 Sep 2025 00:31:18 GMT (envelope-from git) Date: Sun, 14 Sep 2025 00:31:18 GMT Message-Id: <202509140031.58E0VIYo044657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: 6faaef201ca3 - stable/15 - contrib/libxo: fix API header files inclusions in C++ source files 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6faaef201ca3886ab37331ab1a1d46215ac904e4 Auto-Submitted: auto-generated The branch stable/15 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=6faaef201ca3886ab37331ab1a1d46215ac904e4 commit 6faaef201ca3886ab37331ab1a1d46215ac904e4 Author: ShengYi Hung AuthorDate: 2025-09-07 18:33:01 +0000 Commit: Ka Ho Ng CommitDate: 2025-09-14 00:30:34 +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 (cherry picked from commit 11ace56fa030185025936c795d5cf7c57b266835) --- 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 */