diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-10-01 00:46:42 +0200 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2019-10-01 08:46:42 +1000 |
| commit | bdace21b769998396d0ccc8da99a8ca9b507bfdf (patch) | |
| tree | de149589d8dd498ddf3574e9d9551951d3f7e79b /Include | |
| parent | 92ca515ee1efbdc51678e12d105ad642c9b9cc13 (diff) | |
| download | cpython-git-bdace21b769998396d0ccc8da99a8ca9b507bfdf.tar.gz | |
bpo-38304: Remove PyConfig.struct_size (GH-16500)
For now, we'll rely on the fact that the config structures aren't covered by the stable ABI.
We may revisit this in the future if we further explore the idea of offering a stable embedding API.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/cpython/initconfig.h | 12 | ||||
| -rw-r--r-- | Include/internal/pycore_initconfig.h | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h index 8ce5622c5c..25e02cea10 100644 --- a/Include/cpython/initconfig.h +++ b/Include/cpython/initconfig.h @@ -45,10 +45,6 @@ PyAPI_FUNC(PyStatus) PyWideStringList_Insert(PyWideStringList *list, /* --- PyPreConfig ----------------------------------------------- */ typedef struct { - /* Size of the structure in bytes: must be initialized to - sizeof(PyPreConfig). Field used for API and ABI compatibility. */ - size_t struct_size; - int _config_init; /* _PyConfigInitEnum value */ /* Parse Py_PreInitializeFromBytesArgs() arguments? @@ -124,17 +120,13 @@ typedef struct { int allocator; } PyPreConfig; -PyAPI_FUNC(PyStatus) PyPreConfig_InitPythonConfig(PyPreConfig *config); -PyAPI_FUNC(PyStatus) PyPreConfig_InitIsolatedConfig(PyPreConfig *config); +PyAPI_FUNC(void) PyPreConfig_InitPythonConfig(PyPreConfig *config); +PyAPI_FUNC(void) PyPreConfig_InitIsolatedConfig(PyPreConfig *config); /* --- PyConfig ---------------------------------------------- */ typedef struct { - /* Size of the structure in bytes: must be initialized to - sizeof(PyConfig). Field used for API and ABI compatibility. */ - size_t struct_size; - int _config_init; /* _PyConfigInitEnum value */ int isolated; /* Isolated mode? see PyPreConfig.isolated */ diff --git a/Include/internal/pycore_initconfig.h b/Include/internal/pycore_initconfig.h index eb6490f5a8..e9810bcf90 100644 --- a/Include/internal/pycore_initconfig.h +++ b/Include/internal/pycore_initconfig.h @@ -120,8 +120,8 @@ extern PyStatus _PyPreCmdline_Read(_PyPreCmdline *cmdline, /* --- PyPreConfig ----------------------------------------------- */ -PyAPI_FUNC(PyStatus) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig); -extern PyStatus _PyPreConfig_InitFromConfig( +PyAPI_FUNC(void) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig); +extern void _PyPreConfig_InitFromConfig( PyPreConfig *preconfig, const PyConfig *config); extern PyStatus _PyPreConfig_InitFromPreConfig( |