commit 13badcbc60cdbfae1dba1683fd2fae9d70717143
author Serhiy Storchaka <storchaka@gmail.com> Sat Dec 02 21:36:00 2017 +0200
committer GitHub <noreply@github.com> Sat Dec 02 21:36:00 2017 +0200
tree 08df481be4201aeb0c8875c115168d4c4e055140
parent af5a895073c24637c094772b27526b94a12ec897

bpo-32197: Try to fix a compiler error on OS X introduced in bpo-32030. (#4681)

* Revert "bpo-32030: _PyPathConfig_Init() sets home and program_name (#4673)"

This reverts commit af5a895073c24637c094772b27526b94a12ec897.

* Revert "bpo-32030: Fix config_get_program_name() on macOS (#4669)"

This reverts commit e23c06e2b03452c9aaf0dae52296c85e572f9bcd.

* Revert "bpo-32030: Add Python/pathconfig.c (#4668)"

This reverts commit 0ea395ae964c9cd0f499e2ef0d0030c971201220.

* Revert "bpo-32030: Don't call _PyPathConfig_Fini() in Py_FinalizeEx() (#4667)"

This reverts commit ebac19dad6263141d5db0a2c923efe049dba99d2.

* Revert "bpo-32030: Fix Py_GetPath(): init program_name (#4665)"

This reverts commit 9ac3d8882712c9675c3d2f9f84af6b5729575cde.

Include/internal/pystate.h

diff --git a/Include/internal/pystate.h b/Include/internal/pystate.h
index b933421..50ad2fc 100644
--- a/Include/internal/pystate.h
+++ b/Include/internal/pystate.h
@@ -48,36 +48,9 @@
 #endif
     /* Set by Py_SetPath(), or computed by _PyPathConfig_Init() */
     wchar_t *module_search_path;
-    /* Python program name */
-    wchar_t *program_name;
-    /* Set by Py_SetPythonHome() or PYTHONHOME environment variable */
-    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
-
-PyAPI_DATA(_PyPathConfig) _Py_path_config;
-
-PyAPI_FUNC(_PyInitError) _PyPathConfig_Calculate(
-    _PyPathConfig *config,
-    const _PyMainInterpreterConfig *main_config);
-PyAPI_FUNC(void) _PyPathConfig_Clear(_PyPathConfig *config);
+#define _PyPathConfig_INIT {.module_search_path = NULL}
 
 
 /* Full Python runtime state */

Include/pylifecycle.h

diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index fa75169..d32c98b 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -105,10 +105,11 @@
 #ifdef Py_BUILD_CORE
 PyAPI_FUNC(_PyInitError) _PyPathConfig_Init(
     const _PyMainInterpreterConfig *main_config);
+PyAPI_FUNC(void) _PyPathConfig_Fini(void);
 #endif
 PyAPI_FUNC(void)      Py_SetPath(const wchar_t *);
 #ifdef MS_WINDOWS
-int _Py_CheckPython3(void);
+int _Py_CheckPython3();
 #endif
 
 /* In their own files */

Include/pystate.h

diff --git a/Include/pystate.h b/Include/pystate.h
index 1d8aab6..60d001c 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -72,8 +72,7 @@
     (_PyMainInterpreterConfig){\
      .install_signal_handlers = -1, \
      .module_search_path_env = NULL, \
-     .home = NULL, \
-     .program_name = NULL}
+     .home = NULL}
 
 typedef struct _is {