From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 16 Aug 2024 08:49:17 +0000 (+0200)
Subject: [3.13] gh-122584: Import mimalloc headers in a C++ context (GH-122587) (#123035)
X-Git-Tag: v3.13.0rc2~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ee7558833f4afb8b2c5987967b69dc225478a4e;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-122584: Import mimalloc headers in a C++ context (GH-122587) (#123035)

gh-122584: Import mimalloc headers in a C++ context (GH-122587)
(cherry picked from commit 1dad23edbc9db3a13268c1000c8dd428edba29f8)

Co-authored-by: Michael Droettboom <mdboom@gmail.com>
---

diff --git a/Include/internal/pycore_mimalloc.h b/Include/internal/pycore_mimalloc.h
index d10b01d5b49b..d870d01beb70 100644
--- a/Include/internal/pycore_mimalloc.h
+++ b/Include/internal/pycore_mimalloc.h
@@ -36,9 +36,18 @@ typedef enum {
 #  define MI_TSAN 1
 #endif
 
+#ifdef __cplusplus
+extern "C++" {
+#endif
+
 #include "mimalloc/mimalloc.h"
 #include "mimalloc/mimalloc/types.h"
 #include "mimalloc/mimalloc/internal.h"
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 #ifdef Py_GIL_DISABLED