summaryrefslogtreecommitdiffstats
path: root/Modules/main.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-03-05 23:36:56 (GMT)
committerGitHub <noreply@github.com>2019-03-05 23:36:56 (GMT)
commit7d2ef3ef5042356aaeaf832ad4204b7dad2e1b8c (patch)
treeb38d3476031398b85e041b8ac45f85d07a043b38 /Modules/main.c
parenta9df651eb4c18a07ec309df190419613e95cba7b (diff)
downloadcpython-7d2ef3ef5042356aaeaf832ad4204b7dad2e1b8c.zip
cpython-7d2ef3ef5042356aaeaf832ad4204b7dad2e1b8c.tar.gz
cpython-7d2ef3ef5042356aaeaf832ad4204b7dad2e1b8c.tar.bz2
bpo-36142: _PyPreConfig_Write() sets the allocator (GH-12186)
* _PyPreConfig_Write() now sets the memory allocator. * _PyPreConfig_Write() gets a return type: _PyInitError. * _Py_InitializeCore() now reads and writes the pre-configuration (set the memory allocator, configure the locale) before reading and writing the core configuration.
Diffstat (limited to 'Modules/main.c')
-rw-r--r--Modules/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/main.c b/Modules/main.c
index 34032ad..9a2347e 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -304,8 +304,7 @@ preconfig_read_write(_PyPreConfig *config, const _PyArgv *args)
return err;
}
- _PyPreConfig_Write(config);
- return _Py_INIT_OK();
+ return _PyPreConfig_Write(config);
}