summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-08-29 22:50:45 (GMT)
committerGitHub <noreply@github.com>2018-08-29 22:50:45 (GMT)
commitfbca90856d96273fd87c0b126f6e7966af7fbf7b (patch)
tree70be23311a03992573d5fb029acb03b208613440 /Include
parentde427556746aa41a8b5198924ce423021bc0c718 (diff)
downloadcpython-fbca90856d96273fd87c0b126f6e7966af7fbf7b.zip
cpython-fbca90856d96273fd87c0b126f6e7966af7fbf7b.tar.gz
cpython-fbca90856d96273fd87c0b126f6e7966af7fbf7b.tar.bz2
bpo-34523: Use _PyCoreConfig instead of globals (GH-9005)
Use the core configuration of the interpreter, rather than using global configuration variables. For example, replace Py_QuietFlag with core_config->quiet.
Diffstat (limited to 'Include')
-rw-r--r--Include/pylifecycle.h2
-rw-r--r--Include/pystate.h8
2 files changed, 7 insertions, 3 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index b84568e..04e672e 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -123,7 +123,7 @@ PyAPI_FUNC(const char *) _Py_gitversion(void);
#ifndef Py_LIMITED_API
PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
PyAPI_FUNC(_PyInitError) _PySys_BeginInit(PyObject **sysmod);
-PyAPI_FUNC(int) _PySys_EndInit(PyObject *sysdict, _PyMainInterpreterConfig *config);
+PyAPI_FUNC(int) _PySys_EndInit(PyObject *sysdict, PyInterpreterState *interp);
PyAPI_FUNC(_PyInitError) _PyImport_Init(PyInterpreterState *interp);
PyAPI_FUNC(void) _PyExc_Init(PyObject * bltinmod);
PyAPI_FUNC(_PyInitError) _PyImportHooks_Init(void);
diff --git a/Include/pystate.h b/Include/pystate.h
index e410665..80ee0d1 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -249,7 +249,9 @@ PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
PyAPI_FUNC(PyInterpreterState *) _PyInterpreterState_Get(void);
#endif
#ifdef Py_BUILD_CORE
- /* Macro which should only be used for performance critical code */
+ /* Macro which should only be used for performance critical code.
+ Need "#include "internal/pystate.h". See also _PyInterpreterState_Get()
+ and _PyGILState_GetInterpreterStateUnsafe(). */
# define _PyInterpreterState_GET_UNSAFE() (PyThreadState_GET()->interp)
#endif
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
@@ -369,7 +371,9 @@ PyAPI_FUNC(int) PyGILState_Check(void);
GILState implementation.
Return NULL before _PyGILState_Init() is called and after _PyGILState_Fini()
- is called. */
+ is called.
+
+ See also _PyInterpreterState_Get() and _PyInterpreterState_GET_UNSAFE(). */
PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void);
#endif /* !Py_LIMITED_API */