diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-10-31 23:52:28 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-31 23:52:28 (GMT) |
commit | 27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e (patch) | |
tree | 351096bf87da77ee8c4b08362e850e9affd18f8f /Python | |
parent | 3a228ab17c2a9cffd1a2f15f30d6209768de20a6 (diff) | |
download | cpython-27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e.zip cpython-27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e.tar.gz cpython-27e2d1f21975dfb8c0ddcb192fa0f45a51b7977e.tar.bz2 |
bpo-35081: Add pycore_ prefix to internal header files (GH-10263)
* Rename Include/internal/ header files:
* pyatomic.h -> pycore_atomic.h
* ceval.h -> pycore_ceval.h
* condvar.h -> pycore_condvar.h
* context.h -> pycore_context.h
* pygetopt.h -> pycore_getopt.h
* gil.h -> pycore_gil.h
* hamt.h -> pycore_hamt.h
* hash.h -> pycore_hash.h
* mem.h -> pycore_mem.h
* pystate.h -> pycore_state.h
* warnings.h -> pycore_warnings.h
* PCbuild project, Makefile.pre.in, Modules/Setup: add the
Include/internal/ directory to the search paths of header files.
* Update includes. For example, replace #include "internal/mem.h"
with #include "pycore_mem.h".
Diffstat (limited to 'Python')
-rw-r--r-- | Python/_warnings.c | 2 | ||||
-rw-r--r-- | Python/bltinmodule.c | 2 | ||||
-rw-r--r-- | Python/ceval.c | 2 | ||||
-rw-r--r-- | Python/ceval_gil.h | 2 | ||||
-rw-r--r-- | Python/codecs.c | 2 | ||||
-rw-r--r-- | Python/condvar.h | 2 | ||||
-rw-r--r-- | Python/context.c | 6 | ||||
-rw-r--r-- | Python/coreconfig.c | 4 | ||||
-rw-r--r-- | Python/dynload_shlib.c | 2 | ||||
-rw-r--r-- | Python/errors.c | 2 | ||||
-rw-r--r-- | Python/frozenmain.c | 2 | ||||
-rw-r--r-- | Python/getopt.c | 2 | ||||
-rw-r--r-- | Python/hamt.c | 4 | ||||
-rw-r--r-- | Python/import.c | 6 | ||||
-rw-r--r-- | Python/pathconfig.c | 4 | ||||
-rw-r--r-- | Python/pylifecycle.c | 8 | ||||
-rw-r--r-- | Python/pystate.c | 4 | ||||
-rw-r--r-- | Python/pythonrun.c | 2 | ||||
-rw-r--r-- | Python/symtable.c | 2 | ||||
-rw-r--r-- | Python/sysmodule.c | 4 | ||||
-rw-r--r-- | Python/thread.c | 2 | ||||
-rw-r--r-- | Python/traceback.c | 2 |
22 files changed, 34 insertions, 34 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index 8e1c01d..619ec6f 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -1,5 +1,5 @@ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #include "frameobject.h" #include "clinic/_warnings.c.h" diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 8001c60..6c8672a 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -2,7 +2,7 @@ #include "Python.h" #include "Python-ast.h" -#include "internal/pystate.h" +#include "pycore_state.h" #include "node.h" #include "code.h" diff --git a/Python/ceval.c b/Python/ceval.c index 6443123..5599b6e 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -10,7 +10,7 @@ #define PY_LOCAL_AGGRESSIVE #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #include "code.h" #include "dictobject.h" diff --git a/Python/ceval_gil.h b/Python/ceval_gil.h index 4a054a9..f2d5fdb 100644 --- a/Python/ceval_gil.h +++ b/Python/ceval_gil.h @@ -5,7 +5,7 @@ #include <stdlib.h> #include <errno.h> -#include "internal/pyatomic.h" +#include "pycore_atomic.h" /* First some general settings */ diff --git a/Python/codecs.c b/Python/codecs.c index 4062429..62bbee6 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -9,7 +9,7 @@ Copyright (c) Corporation for National Research Initiatives. ------------------------------------------------------------------------ */ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #include "ucnhash.h" #include <ctype.h> diff --git a/Python/condvar.h b/Python/condvar.h index 951b8ad..1351740 100644 --- a/Python/condvar.h +++ b/Python/condvar.h @@ -41,7 +41,7 @@ #define _CONDVAR_IMPL_H_ #include "Python.h" -#include "internal/condvar.h" +#include "pycore_condvar.h" #ifdef _POSIX_THREADS /* diff --git a/Python/context.c b/Python/context.c index 7344e96..b1f67b5 100644 --- a/Python/context.c +++ b/Python/context.c @@ -1,9 +1,9 @@ #include "Python.h" #include "structmember.h" -#include "internal/pystate.h" -#include "internal/context.h" -#include "internal/hamt.h" +#include "pycore_state.h" +#include "pycore_context.h" +#include "pycore_hamt.h" #define CONTEXT_FREELIST_MAXLEN 255 diff --git a/Python/coreconfig.c b/Python/coreconfig.c index 81086f4..ad14a8a 100644 --- a/Python/coreconfig.c +++ b/Python/coreconfig.c @@ -1,6 +1,6 @@ #include "Python.h" -#include "internal/mem.h" -#include "internal/pystate.h" +#include "pycore_mem.h" +#include "pycore_state.h" #include <locale.h> #ifdef HAVE_LANGINFO_H # include <langinfo.h> diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index 73ae26d..9896560 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -2,7 +2,7 @@ /* Support for dynamic loading of extension modules */ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #include "importdl.h" #include <sys/types.h> diff --git a/Python/errors.c b/Python/errors.c index 2926ea1..14a70d9 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -2,7 +2,7 @@ /* Error handling */ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #ifndef __STDC__ #ifndef MS_WINDOWS diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 86af2b6..9e90666 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -2,7 +2,7 @@ /* Python interpreter main program for frozen scripts */ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #include <locale.h> #ifdef MS_WINDOWS diff --git a/Python/getopt.c b/Python/getopt.c index e8d7e52..c165a94 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -31,7 +31,7 @@ #include <stdio.h> #include <string.h> #include <wchar.h> -#include "internal/pygetopt.h" +#include "pycore_getopt.h" #ifdef __cplusplus extern "C" { diff --git a/Python/hamt.c b/Python/hamt.c index 562f777..be3813b 100644 --- a/Python/hamt.c +++ b/Python/hamt.c @@ -1,8 +1,8 @@ #include "Python.h" #include "structmember.h" -#include "internal/pystate.h" -#include "internal/hamt.h" +#include "pycore_state.h" +#include "pycore_hamt.h" /* This file provides an implemention of an immutable mapping using the diff --git a/Python/import.c b/Python/import.c index 338cd30..18cd29d 100644 --- a/Python/import.c +++ b/Python/import.c @@ -4,9 +4,9 @@ #include "Python-ast.h" #undef Yield /* undefine macro conflicting with winbase.h */ -#include "internal/hash.h" -#include "internal/mem.h" -#include "internal/pystate.h" +#include "pycore_hash.h" +#include "pycore_mem.h" +#include "pycore_state.h" #include "errcode.h" #include "marshal.h" #include "code.h" diff --git a/Python/pathconfig.c b/Python/pathconfig.c index efccb8d..0406415 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -2,8 +2,8 @@ #include "Python.h" #include "osdefs.h" -#include "internal/mem.h" -#include "internal/pystate.h" +#include "pycore_mem.h" +#include "pycore_state.h" #include <wchar.h> #ifdef __cplusplus diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index fab96fd..d349aaf 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -4,10 +4,10 @@ #include "Python-ast.h" #undef Yield /* undefine macro conflicting with winbase.h */ -#include "internal/context.h" -#include "internal/hamt.h" -#include "internal/mem.h" -#include "internal/pystate.h" +#include "pycore_context.h" +#include "pycore_hamt.h" +#include "pycore_mem.h" +#include "pycore_state.h" #include "grammar.h" #include "node.h" #include "token.h" diff --git a/Python/pystate.c b/Python/pystate.c index 98e954d..c77902a 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -2,8 +2,8 @@ /* Thread and interpreter state structures and their interfaces */ #include "Python.h" -#include "internal/mem.h" -#include "internal/pystate.h" +#include "pycore_mem.h" +#include "pycore_state.h" #define _PyThreadState_SET(value) \ _Py_atomic_store_relaxed(&_PyRuntime.gilstate.tstate_current, \ diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 276c5d1..2f61aab 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -12,7 +12,7 @@ #include "Python-ast.h" #undef Yield /* undefine macro conflicting with winbase.h */ -#include "internal/pystate.h" +#include "pycore_state.h" #include "grammar.h" #include "node.h" #include "token.h" diff --git a/Python/symtable.c b/Python/symtable.c index dc934a5..dae6fda 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -1,5 +1,5 @@ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #ifdef Yield #undef Yield /* undefine conflicting macro from winbase.h */ #endif diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 71414c9..cb13e21 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -15,8 +15,8 @@ Data members: */ #include "Python.h" -#include "internal/mem.h" -#include "internal/pystate.h" +#include "pycore_mem.h" +#include "pycore_state.h" #include "code.h" #include "frameobject.h" #include "pythread.h" diff --git a/Python/thread.c b/Python/thread.c index a1e1fa6..6355381 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -6,7 +6,7 @@ Stuff shared by all thread_*.h files is collected here. */ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #ifndef _POSIX_THREADS /* This means pthreads are not implemented in libc headers, hence the macro diff --git a/Python/traceback.c b/Python/traceback.c index 5b5c715..e2070f0 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -2,7 +2,7 @@ /* Traceback implementation */ #include "Python.h" -#include "internal/pystate.h" +#include "pycore_state.h" #include "code.h" #include "frameobject.h" |