From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 11 Feb 2018 17:16:04 +0000 (-0800)
Subject: bpo-32604: Make _xxsubinterpreters build on Windows (GH-5624)
X-Git-Tag: v3.7.0b2~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe61e8d8c7cd1f6fb0ce7e9b8f0460b47b5f29a5;p=python

bpo-32604: Make _xxsubinterpreters build on Windows (GH-5624)

This is not the ideal solution; this means that a test module is now
always included in the main python3x.dll.  However, we're already
including xxsubtype, so why not?
(cherry picked from commit 310b05289b5d9550040f469e60b5e8e77f1022b6)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
---

diff --git a/PC/config.c b/PC/config.c
index 6209d7e284..0c08bfeaa0 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -31,7 +31,9 @@ extern PyObject* PyInit__locale(void);
 #endif
 extern PyObject* PyInit__codecs(void);
 extern PyObject* PyInit__weakref(void);
+/* XXX: These two should really be extracted to standalone extensions. */
 extern PyObject* PyInit_xxsubtype(void);
+extern PyObject* PyInit__xxsubinterpreters(void);
 extern PyObject* PyInit_zipimport(void);
 extern PyObject* PyInit__random(void);
 extern PyObject* PyInit_itertools(void);
@@ -126,6 +128,7 @@ struct _inittab _PyImport_Inittab[] = {
     {"_json", PyInit__json},
 
     {"xxsubtype", PyInit_xxsubtype},
+    {"_xxsubinterpreters", PyInit__xxsubinterpreters},
     {"zipimport", PyInit_zipimport},
 #ifdef _Py_HAVE_ZLIB
     {"zlib", PyInit_zlib},
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index f309455086..bf4131e91b 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -279,6 +279,7 @@
     <ClCompile Include="..\Modules\_tracemalloc.c" />
     <ClCompile Include="..\Modules\timemodule.c" />
     <ClCompile Include="..\Modules\xxsubtype.c" />
+    <ClCompile Include="..\Modules\_xxsubinterpretersmodule.c" />
     <ClCompile Include="..\Modules\zipimport.c" />
     <ClCompile Include="..\Modules\_io\fileio.c" />
     <ClCompile Include="..\Modules\_io\bytesio.c" />