Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyo3-ffi/src/modsupport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ pub const PyABIInfo_FREETHREADING_AGNOSTIC: u16 = PyABIInfo_GIL | PyABIInfo_FREE

#[cfg(Py_3_15)]
extern "C" {
pub fn PyABIInfo_Check(info: *mut PyABIInfo, module_name: *const c_char);
pub fn PyABIInfo_Check(info: *mut PyABIInfo, module_name: *const c_char) -> c_int;
}

#[cfg(all(Py_LIMITED_API, Py_3_15))]
Expand Down Expand Up @@ -209,6 +209,6 @@ pub const _PyABIInfo_DEFAULT: PyABIInfo = PyABIInfo {
#[macro_export]
macro_rules! PyABIInfo_VAR {
($name:ident) => {
static mut $name: PyABIInfo = _PyABIInfo_DEFAULT;
static mut $name: pyo3_ffi::PyABIInfo = pyo3_ffi::_PyABIInfo_DEFAULT;
};
}
11 changes: 7 additions & 4 deletions pyo3-ffi/src/moduleobject.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,13 @@ extern "C" {

#[cfg(Py_3_15)]
extern "C" {
pub fn PyModule_FromSlotsAndSpec(slots: *const PyModuleDef_Slot, spec: *mut PyObject);
pub fn PyModule_Exec(_mod: *mut PyObject);
pub fn PyModule_GetStateSize(_mod: *mut PyObject, result: *mut Py_ssize_t);
pub fn PyModule_GetToken(module: *mut PyObject, result: *mut *mut c_void);
pub fn PyModule_FromSlotsAndSpec(
slots: *const PyModuleDef_Slot,
spec: *mut PyObject,
) -> *mut PyObject;
pub fn PyModule_Exec(_mod: *mut PyObject) -> c_int;
pub fn PyModule_GetStateSize(_mod: *mut PyObject, result: *mut Py_ssize_t) -> c_int;
pub fn PyModule_GetToken(module: *mut PyObject, result: *mut *mut c_void) -> c_int;
}

#[repr(C)]
Expand Down
3 changes: 2 additions & 1 deletion pyo3-ffi/src/object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -742,5 +742,6 @@ extern "C" {
pub fn PyType_Freeze(tp: *mut crate::PyTypeObject) -> c_int;

#[cfg(Py_3_15)]
pub fn PyType_GetModuleByToken(_type: *mut PyTypeObject, token: *const c_void);
pub fn PyType_GetModuleByToken(_type: *mut PyTypeObject, token: *const c_void)
-> *mut PyObject;
}
Loading