From 6666c335e6b0eece58ccd14d059a52918ae50917 Mon Sep 17 00:00:00 2001
From: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
Date: Tue, 4 Jul 2023 07:01:11 +0100
Subject: [PATCH] add PyState_*Module definitions for PyPy

---
 newsfragments/3295.added.md |  1 +
 pyo3-ffi/src/pystate.rs     | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 newsfragments/3295.added.md

diff --git a/newsfragments/3295.added.md b/newsfragments/3295.added.md
new file mode 100644
index 00000000..82987455
--- /dev/null
+++ b/newsfragments/3295.added.md
@@ -0,0 +1 @@
+Add FFI definitions `PyState_AddModule`, `PyState_RemoveModule` and `PyState_FindModule` for PyPy 3.9 and up.
diff --git a/pyo3-ffi/src/pystate.rs b/pyo3-ffi/src/pystate.rs
index 8bae6652..d2fd39e4 100644
--- a/pyo3-ffi/src/pystate.rs
+++ b/pyo3-ffi/src/pystate.rs
@@ -1,4 +1,4 @@
-#[cfg(not(PyPy))]
+#[cfg(any(not(PyPy), Py_3_9))]
 use crate::moduleobject::PyModuleDef;
 use crate::object::PyObject;
 use std::os::raw::c_int;
@@ -28,13 +28,17 @@ extern "C" {
     #[cfg(not(PyPy))]
     pub fn PyInterpreterState_GetID(arg1: *mut PyInterpreterState) -> i64;
 
-    #[cfg(not(PyPy))]
+    #[cfg(any(not(PyPy), Py_3_9))] // only on PyPy since 3.9
+    #[cfg_attr(PyPy, link_name = "PyPyState_AddModule")]
     pub fn PyState_AddModule(arg1: *mut PyObject, arg2: *mut PyModuleDef) -> c_int;
 
-    #[cfg(not(PyPy))]
+    #[cfg(any(not(PyPy), Py_3_9))] // only on PyPy since 3.9
+    #[cfg_attr(PyPy, link_name = "PyPyState_RemoveModule")]
     pub fn PyState_RemoveModule(arg1: *mut PyModuleDef) -> c_int;
 
-    #[cfg(not(PyPy))]
+    #[cfg(any(not(PyPy), Py_3_9))] // only on PyPy since 3.9
+    // only has PyPy prefix since 3.10
+    #[cfg_attr(all(PyPy, Py_3_10), link_name = "PyPyState_FindModule")]
     pub fn PyState_FindModule(arg1: *mut PyModuleDef) -> *mut PyObject;
 
     #[cfg_attr(PyPy, link_name = "PyPyThreadState_New")]