mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 12:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
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 310b05289b)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
This commit is contained in:
Miss Islington (bot) 2018-02-11 09:16:04 -08:00 • committed by Zachary Ware
parent a0b998df31
commit fe61e8d8c7
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PC/config.c
View file

@ -31,7 +31,9 @@ extern PyObject* PyInit__locale(void);
#endif #endif
extern PyObject* PyInit__codecs(void); extern PyObject* PyInit__codecs(void);
extern PyObject* PyInit__weakref(void); extern PyObject* PyInit__weakref(void);
/* XXX: These two should really be extracted to standalone extensions. */
extern PyObject* PyInit_xxsubtype(void); extern PyObject* PyInit_xxsubtype(void);
extern PyObject* PyInit__xxsubinterpreters(void);
extern PyObject* PyInit_zipimport(void); extern PyObject* PyInit_zipimport(void);
extern PyObject* PyInit__random(void); extern PyObject* PyInit__random(void);
extern PyObject* PyInit_itertools(void); extern PyObject* PyInit_itertools(void);
@ -126,6 +128,7 @@ struct _inittab _PyImport_Inittab[] = {
{"_json", PyInit__json}, {"_json", PyInit__json},
{"xxsubtype", PyInit_xxsubtype}, {"xxsubtype", PyInit_xxsubtype},
{"_xxsubinterpreters", PyInit__xxsubinterpreters},
{"zipimport", PyInit_zipimport}, {"zipimport", PyInit_zipimport},
#ifdef _Py_HAVE_ZLIB #ifdef _Py_HAVE_ZLIB
{"zlib", PyInit_zlib}, {"zlib", PyInit_zlib},

1
PCbuild/pythoncore.vcxproj
View file

@ -279,6 +279,7 @@
<ClCompile Include="..\Modules\_tracemalloc.c" /> <ClCompile Include="..\Modules\_tracemalloc.c" />
<ClCompile Include="..\Modules\timemodule.c" /> <ClCompile Include="..\Modules\timemodule.c" />
<ClCompile Include="..\Modules\xxsubtype.c" /> <ClCompile Include="..\Modules\xxsubtype.c" />
<ClCompile Include="..\Modules\_xxsubinterpretersmodule.c" />
<ClCompile Include="..\Modules\zipimport.c" /> <ClCompile Include="..\Modules\zipimport.c" />
<ClCompile Include="..\Modules\_io\fileio.c" /> <ClCompile Include="..\Modules\_io\fileio.c" />
<ClCompile Include="..\Modules\_io\bytesio.c" /> <ClCompile Include="..\Modules\_io\bytesio.c" />