summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-11-24 21:57:41 (GMT)
committerGitHub <noreply@github.com>2021-11-24 21:57:41 (GMT)
commitcd85d91bc66a587ce2ba668c897a5ecf118733cc (patch)
treefbbca66882b2b201cd93e66e29278b83b0b795e7
parent8cabcde8d66bfd8abc98b862c93c66946f8514a1 (diff)
downloadcpython-cd85d91bc66a587ce2ba668c897a5ecf118733cc.zip
cpython-cd85d91bc66a587ce2ba668c897a5ecf118733cc.tar.gz
cpython-cd85d91bc66a587ce2ba668c897a5ecf118733cc.tar.bz2
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>
-rw-r--r--.github/workflows/build.yml4
-rw-r--r--Include/cpython/initconfig.h6
2 files changed, 10 insertions, 0 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88f825e..01b75ae 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 09f9a29..583165b 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 */