mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
bpo-38234: Remove _PyPathConfig.dll_path (GH-16307)
The DLL path is not computed from any user configuration and cannot be configured by PyConfig. Instead, add a new _Py_dll_path global variable. Remove _PyConfig_SetPathConfig(): replaced with _PyPathConfig_Init(). Py_Initialize() now longer sets the "global path configuration", but only initialize _Py_dll_path.
This commit is contained in:
parent
b1542583be
commit
c422167749
5 changed files with 85 additions and 95 deletions
|
@ -13,10 +13,7 @@ typedef struct _PyPathConfig {
|
|||
wchar_t *program_full_path;
|
||||
wchar_t *prefix;
|
||||
wchar_t *exec_prefix;
|
||||
#ifdef MS_WINDOWS
|
||||
wchar_t *dll_path;
|
||||
#endif
|
||||
/* Set by Py_SetPath(), or computed by _PyPathConfig_Init() */
|
||||
/* Set by Py_SetPath(), or computed by _PyConfig_InitPathConfig() */
|
||||
wchar_t *module_search_path;
|
||||
/* Python program name */
|
||||
wchar_t *program_name;
|
||||
|
@ -38,6 +35,9 @@ typedef struct _PyPathConfig {
|
|||
/* Note: _PyPathConfig_INIT sets other fields to 0/NULL */
|
||||
|
||||
PyAPI_DATA(_PyPathConfig) _Py_path_config;
|
||||
#ifdef MS_WINDOWS
|
||||
PyAPI_DATA(wchar_t*) _Py_dll_path;
|
||||
#endif
|
||||
|
||||
extern void _PyPathConfig_ClearGlobal(void);
|
||||
extern PyStatus _PyPathConfig_SetGlobal(
|
||||
|
@ -59,6 +59,8 @@ extern int _Py_FindEnvConfigValue(
|
|||
extern wchar_t* _Py_GetDLLPath(void);
|
||||
#endif
|
||||
|
||||
extern PyStatus _PyPathConfig_Init(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue