diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-11-01 02:15:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 02:15:58 (GMT) |
| commit | a1c249c40517917d2e0971d55aea8d14a44b2cc8 (patch) | |
| tree | 626ca174cb49d8dd299f529cc100485a08bea9d2 /Modules | |
| parent | e281f7d80ce2584a7e6a36acffb5a9cd796a0fe2 (diff) | |
| download | cpython-a1c249c40517917d2e0971d55aea8d14a44b2cc8.zip cpython-a1c249c40517917d2e0971d55aea8d14a44b2cc8.tar.gz cpython-a1c249c40517917d2e0971d55aea8d14a44b2cc8.tar.bz2 | |
bpo-35081: And pycore_lifecycle.h and pycore_pathconfig.h (GH-10273)
* And pycore_lifecycle.h and pycore_pathconfig.h headers to
Include/internal/
* Move Py_BUILD_CORE specific code from coreconfig.h and
pylifecycle.h to pycore_pathconfig.h and pycore_lifecycle.h
* Move _Py_wstrlist_XXX() definitions and _PyPathConfig code
from pycore_state.h to pycore_pathconfig.h
* Move "Init" and "Fini" function definitions from pylifecycle.c to
pycore_lifecycle.h.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_testcapimodule.c | 7 | ||||
| -rw-r--r-- | Modules/getpath.c | 3 | ||||
| -rw-r--r-- | Modules/main.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 018af4a..e2deb26 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -8,10 +8,12 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include <float.h> -#include "structmember.h" #include "datetime.h" #include "marshal.h" +#include "pycore_pathconfig.h" +#include "pythread.h" +#include "structmember.h" +#include <float.h> #include <signal.h> #ifdef MS_WINDOWS @@ -22,7 +24,6 @@ #include <sys/wait.h> /* For W_STOPCODE */ #endif -#include "pythread.h" static PyObject *TestError; /* set to exception object in init */ /* Raise TestError with test_name + ": " + msg, and return NULL. */ diff --git a/Modules/getpath.c b/Modules/getpath.c index 53e5c2b..0e21071 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -1,8 +1,9 @@ /* Return the initial module search path. */ #include "Python.h" -#include "pycore_state.h" #include "osdefs.h" +#include "pycore_pathconfig.h" +#include "pycore_state.h" #include <sys/types.h> #include <string.h> diff --git a/Modules/main.c b/Modules/main.c index 1918f4f..c847d1a 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -2,8 +2,10 @@ #include "Python.h" #include "osdefs.h" -#include "pycore_mem.h" #include "pycore_getopt.h" +#include "pycore_lifecycle.h" +#include "pycore_mem.h" +#include "pycore_pathconfig.h" #include "pycore_state.h" #include <locale.h> |