Try to fix PyInterpreterState_Get() again

Author: vstinner

docs/api.rst

@@ -820,7 +820,9 @@ PyInterpreterState
 
    See `PyInterpreterState_Get() documentation <https://docs.python.org/dev/c-api/init.html#c.PyInterpreterState_Get>`__.
 
-   Not available on limited C API 3.8 and older.
+   Not available on limited C API 3.8 and older on Unix.
+
+   Not available in stable ABI 3.9 and older on Windows.
 
 
 GC protocol

pythoncapi_compat.h

@@ -355,11 +355,9 @@ _PyThreadState_GetFrameBorrow(PyThreadState *tstate)
 // PyPy added PyInterpreterState_Get() to PyPy3.12 v8.0.0
 // On Windows, PyInterpreterState_Get() was added to limited C API 3.10.
 #if ((PY_VERSION_HEX < 0x030900A5 \
-        || (defined(PYPY_VERSION) && PY_VERSION_HEX < 0x030C0000)) \
-        && !(defined(Py_LIMITED_API) && PY_VERSION_HEX < 0x030A0000))
-
-static inline PyInterpreterState*
-PythonCAPICompat_PyInterpreterState_Get(void)
+            || (defined(PYPY_VERSION) && PY_VERSION_HEX < 0x030C0000)) \
+        && !defined(Py_LIMITED_API))
+static inline PyInterpreterState* PyInterpreterState_Get(void)
 {
     PyThreadState *tstate;
     PyInterpreterState *interp;
@@ -374,19 +372,6 @@ PythonCAPICompat_PyInterpreterState_Get(void)
     }
     return interp;
 }
-
-#if !(defined(Py_LIMITED_API) && PY_VERSION_HEX < 0x030A0000 && defined(MS_WINDOWS))
-static inline PyInterpreterState* PyInterpreterState_Get(void)
-{
-    return PythonCAPICompat_PyInterpreterState_Get();
-}
-#else
-    // PyInterpreterState_Get() is in the limited C API 3.9, but not in
-    // the 3.9 stable ABI on Windows. It was added to stable ABI on Windows
-    // in Python 3.10.  Use a macro to override C API function.
-#   define PyInterpreterState_Get() PythonCAPICompat_PyInterpreterState_Get()
-#endif
-
 #endif
 
 

tests/test_pythoncapi_compat_cext.c

@@ -336,7 +336,10 @@ test_thread_state(PyObject *Py_UNUSED(module), PyObject* Py_UNUSED(ignored))
 static PyObject *
 test_interpreter(PyObject *Py_UNUSED(module), PyObject* Py_UNUSED(ignored))
 {
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
+    // On Windows,PyInterpreterState_Get() is not available in stable ABI 3.9,
+    // only in stable ABI 3.10. Don't test it in limited C API 3.9 on Unix to
+    // make the test simpler.
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000
     // test PyInterpreterState_Get()
     PyInterpreterState *interp = PyInterpreterState_Get();
     assert(interp != _Py_NULL);