GH-108614: Unbreak emscripten build (GH-109132)

diff --git a/Include/internal/pycore_emscripten_signal.h b/Include/internal/pycore_emscripten_signal.h
index d1bcb9a92c77264f17a68a0aa11287c09b0fb6a8..754193e21dec5a5608200d4302bbfc6c6b1e7eb1 100644 (file)
--- a/Include/internal/pycore_emscripten_signal.h
+++ b/Include/internal/pycore_emscripten_signal.h
@@ -18,6 +18,7 @@ _Py_CheckEmscriptenSignalsPeriodically(void);
 #define _Py_CHECK_EMSCRIPTEN_SIGNALS_PERIODICALLY() _Py_CheckEmscriptenSignalsPeriodically()
 
 extern int Py_EMSCRIPTEN_SIGNAL_HANDLING;
+extern int _Py_emscripten_signal_clock;
 
 #else
 

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 8820b52774671bd3d588300bbf0b229d90efe284..21069204cf86930ec7ead3441aed267bd7b63384 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -154,8 +154,8 @@ dummy_func(
 
         inst(RESUME_CHECK, (--)) {
 #if defined(__EMSCRIPTEN__)
-            DEOPT_IF(emscripten_signal_clock == 0, RESUME);
-            emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
+            DEOPT_IF(_Py_emscripten_signal_clock == 0, RESUME);
+            _Py_emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
 #endif
             /* Possibly combine these two checks */
             DEOPT_IF(_PyFrame_GetCode(frame)->_co_instrumentation_version

diff --git a/Python/emscripten_signal.c b/Python/emscripten_signal.c
index 1a196385b8ce346ccf407600b9808f95bc0c4aef..561b5b73cd6b7099f0639d37de479ba9d74ad2e6 100644 (file)
--- a/Python/emscripten_signal.c
+++ b/Python/emscripten_signal.c
@@ -39,16 +39,16 @@ _Py_CheckEmscriptenSignals(void)
 }
 
 #define PY_EMSCRIPTEN_SIGNAL_INTERVAL 50
-static int emscripten_signal_clock = PY_EMSCRIPTEN_SIGNAL_INTERVAL;
+int _Py_emscripten_signal_clock = PY_EMSCRIPTEN_SIGNAL_INTERVAL;
 
 void
 _Py_CheckEmscriptenSignalsPeriodically(void)
 {
-    if (emscripten_signal_clock == 0) {
-        emscripten_signal_clock = PY_EMSCRIPTEN_SIGNAL_INTERVAL;
+    if (_Py_emscripten_signal_clock == 0) {
+        _Py_emscripten_signal_clock = PY_EMSCRIPTEN_SIGNAL_INTERVAL;
         _Py_CheckEmscriptenSignals();
     }
     else if (Py_EMSCRIPTEN_SIGNAL_HANDLING) {
-        emscripten_signal_clock--;
+        _Py_emscripten_signal_clock--;
     }
 }

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index f4c526a5a8c0a2a20d1f60f9bb056833329be29b..fa7cb88e4a1e1ff95d75eb1a916d47201c35db24 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -9,8 +9,8 @@
 
         case RESUME_CHECK: {
 #if defined(__EMSCRIPTEN__)
-            DEOPT_IF(emscripten_signal_clock == 0, RESUME);
-            emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
+            DEOPT_IF(_Py_emscripten_signal_clock == 0, RESUME);
+            _Py_emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
 #endif
             /* Possibly combine these two checks */
             DEOPT_IF(_PyFrame_GetCode(frame)->_co_instrumentation_version

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 84f83db128ea50e7030b4936f4a5cc4b5b574553..136b36c8260cb5da7b51f1d6c7be7d6ed0bc2670 100644 (file)
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -28,8 +28,8 @@
 
         TARGET(RESUME_CHECK) {
 #if defined(__EMSCRIPTEN__)
-            DEOPT_IF(emscripten_signal_clock == 0, RESUME);
-            emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
+            DEOPT_IF(_Py_emscripten_signal_clock == 0, RESUME);
+            _Py_emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
 #endif
             /* Possibly combine these two checks */
             DEOPT_IF(_PyFrame_GetCode(frame)->_co_instrumentation_version