diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-12-05 14:12:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 14:12:41 (GMT) |
| commit | 33c377ed9b6cb3b9493005314c4e0cfa7517ea65 (patch) | |
| tree | 57c547459a63179830eba576c4ea2959a605c117 /Include/internal/pystate.h | |
| parent | ae342cf7deebdcf2035f4064609b32b2102dadcf (diff) | |
| download | cpython-33c377ed9b6cb3b9493005314c4e0cfa7517ea65.zip cpython-33c377ed9b6cb3b9493005314c4e0cfa7517ea65.tar.gz cpython-33c377ed9b6cb3b9493005314c4e0cfa7517ea65.tar.bz2 | |
bpo-32030: Simplify _PyCoreConfig_INIT macro (#4728)
* Simplify _PyCoreConfig_INIT, _PyMainInterpreterConfig_INIT,
_PyPathConfig_INIT macros: no need to set fields to 0/NULL, it's
redundant (the C language sets them to 0/NULL for us).
* Fix typo: pymain_run_statup() => pymain_run_startup()
* Remove a few XXX/TODO
Diffstat (limited to 'Include/internal/pystate.h')
| -rw-r--r-- | Include/internal/pystate.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/Include/internal/pystate.h b/Include/internal/pystate.h index b933421..6b527fb 100644 --- a/Include/internal/pystate.h +++ b/Include/internal/pystate.h @@ -54,23 +54,8 @@ typedef struct { wchar_t *home; } _PyPathConfig; -#ifdef MS_WINDOWS -#define _PyPathConfig_INIT \ - {.program_full_path = NULL, \ - .prefix = NULL, \ - .dll_path = NULL, \ - .module_search_path = NULL, \ - .program_name = NULL, \ - .home = NULL} -#else -#define _PyPathConfig_INIT \ - {.program_full_path = NULL, \ - .prefix = NULL, \ - .exec_prefix = NULL, \ - .module_search_path = NULL, \ - .program_name = NULL, \ - .home = NULL} -#endif +#define _PyPathConfig_INIT {.module_search_path = NULL} +/* Note: _PyPathConfig_INIT sets other fields to 0/NULL */ PyAPI_DATA(_PyPathConfig) _Py_path_config; @@ -116,6 +101,7 @@ typedef struct pyruntimestate { } _PyRuntimeState; #define _PyRuntimeState_INIT {.initialized = 0, .core_initialized = 0} +/* Note: _PyRuntimeState_INIT sets other fields to 0/NULL */ PyAPI_DATA(_PyRuntimeState) _PyRuntime; PyAPI_FUNC(_PyInitError) _PyRuntimeState_Init(_PyRuntimeState *); |