From 1c4cbdf94dbb4a6ac1093d2fa7a75efa802b25bc Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Mon, 13 Apr 2020 11:45:21 +0200
Subject: bpo-40268: Add pycore_runtime.h header file (GH-19493)

Move PyRuntimeState from pycore_pystate.h to pycore_runtime.h.

Remove _PyGILState_check_enabled macro: access directly
_PyRuntime.gilstate.check_enabled.
---
 Python/pylifecycle.c | 2 +-
 Python/pystate.c     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'Python')

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 1bc7d77d35..c2a078163a 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1553,7 +1553,7 @@ new_interpreter(PyThreadState **tstate_p)
 
     /* Issue #10915, #15751: The GIL API doesn't work with multiple
        interpreters: disable PyGILState_Check(). */
-    _PyGILState_check_enabled = 0;
+    runtime->gilstate.check_enabled = 0;
 
     PyInterpreterState *interp = PyInterpreterState_New();
     if (interp == NULL) {
diff --git a/Python/pystate.c b/Python/pystate.c
index 19beaf05eb..3636dc9c04 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -1329,12 +1329,11 @@ PyGILState_GetThisThreadState(void)
 int
 PyGILState_Check(void)
 {
-
-    if (!_PyGILState_check_enabled) {
+    struct _gilstate_runtime_state *gilstate = &_PyRuntime.gilstate;
+    if (!gilstate->check_enabled) {
         return 1;
     }
 
-    struct _gilstate_runtime_state *gilstate = &_PyRuntime.gilstate;
     if (!PyThread_tss_is_created(&gilstate->autoTSSkey)) {
         return 1;
     }
-- 
cgit v1.2.1