From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 24 Nov 2021 21:57:41 +0000 (-0800)
Subject: bpo-45893: Add missing extern C to initconfig.h (GH-29761)
X-Git-Tag: v3.10.1~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd85d91bc66a587ce2ba668c897a5ecf118733cc;p=thirdparty%2FPython%2Fcpython.git

bpo-45893: Add missing extern C to initconfig.h (GH-29761)


Co-authored-by: Steve Dower <steve.dower@python.org>
(cherry picked from commit f4afc53bf68c8ded20b281cd1baa88a679b4a3fd)

Co-authored-by: Christian Heimes <christian@python.org>
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88f825e613bc..01b75aedafed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -115,6 +115,8 @@ jobs:
     runs-on: windows-latest
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    env:
+       IncludeUwp: 'true'
     steps:
     - uses: actions/checkout@v2
     - name: Build CPython
@@ -129,6 +131,8 @@ jobs:
     runs-on: windows-latest
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
+    env:
+       IncludeUwp: 'true'
     steps:
     - uses: actions/checkout@v2
     - name: Register MSVC problem matcher
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
index 09f9a2947efe..583165bee48c 100644
--- a/Include/cpython/initconfig.h
+++ b/Include/cpython/initconfig.h
@@ -1,6 +1,9 @@
 #ifndef Py_PYCORECONFIG_H
 #define Py_PYCORECONFIG_H
 #ifndef Py_LIMITED_API
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* --- PyStatus ----------------------------------------------- */
 
@@ -239,5 +242,8 @@ PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
    See also PyConfig.orig_argv. */
 PyAPI_FUNC(void) Py_GetArgcArgv(int *argc, wchar_t ***argv);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* !Py_LIMITED_API */
 #endif /* !Py_PYCORECONFIG_H */