diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-24 12:09:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-24 12:09:24 +0100 |
| commit | 9e87e7776f7ace66baaf7247233afdabd00c2b44 (patch) | |
| tree | e43699904e2de8394d7e408b231174f7a87c9b4a /PCbuild | |
| parent | 4864a619dc1cc9092780ccf5a6327e8abf66133d (diff) | |
| download | cpython-git-9e87e7776f7ace66baaf7247233afdabd00c2b44.tar.gz | |
bpo-32096: Remove obj and mem from _PyRuntime (#4532)
bpo-32096, bpo-30860: Partially revert the commit
2ebc5ce42a8a9e047e790aefbf9a94811569b2b6:
* Move structures back from Include/internal/mem.h to
Objects/obmalloc.c
* Remove _PyObject_Initialize() and _PyMem_Initialize()
* Remove Include/internal/pymalloc.h
* Add test_capi.test_pre_initialization_api():
Make sure that it's possible to call Py_DecodeLocale(), and then call
Py_SetProgramName() with the decoded string, before Py_Initialize().
PyMem_RawMalloc() and Py_DecodeLocale() can be called again before
_PyRuntimeState_Init().
Co-Authored-By: Eric Snow <ericsnowcurrently@gmail.com>
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 1 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 246de78463..3793cbda88 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -116,7 +116,6 @@ <ClInclude Include="..\Include\internal\condvar.h" /> <ClInclude Include="..\Include\internal\gil.h" /> <ClInclude Include="..\Include\internal\mem.h" /> - <ClInclude Include="..\Include\internal\pymalloc.h" /> <ClInclude Include="..\Include\internal\pystate.h" /> <ClInclude Include="..\Include\internal\warnings.h" /> <ClInclude Include="..\Include\intrcheck.h" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index b37e9930e3..1d33c6e2cc 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -141,9 +141,6 @@ <ClInclude Include="..\Include\internal\mem.h"> <Filter>Include</Filter> </ClInclude> - <ClInclude Include="..\Include\internal\pymalloc.h"> - <Filter>Include</Filter> - </ClInclude> <ClInclude Include="..\Include\internal\pystate.h"> <Filter>Include</Filter> </ClInclude> @@ -1031,4 +1028,4 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |