Fix struct definitions to match target api version

Author: mattiapenati

src/npyffi/objects.rs

@@ -4,6 +4,7 @@
 #![allow(non_camel_case_types)]
 
 use libc::FILE;
+use pyo3::ffi::vectorcallfunc;
 use pyo3::ffi::*;
 use std::os::raw::*;
 
@@ -21,6 +22,12 @@ pub struct PyArrayObject {
     pub descr: *mut PyArray_Descr,
     pub flags: c_int,
     pub weakreflist: *mut PyObject,
+
+    #[cfg(Numpy_1_20)]
+    pub _buffer_info: *mut c_void,
+
+    #[cfg(Numpy_1_22)]
+    pub mem_handler: *mut PyObject,
 }
 
 #[repr(C)]
@@ -32,6 +39,19 @@ pub struct PyArray_Descr {
     pub byteorder: c_char,
     pub _former_flags: c_char,
     pub type_num: c_int,
+
+    #[cfg(Numpy_2_0)]
+    pub flags: npy_uint64,
+    #[cfg(Numpy_2_0)]
+    pub elsize: npy_intp,
+    #[cfg(Numpy_2_0)]
+    pub alignment: npy_intp,
+    #[cfg(Numpy_2_0)]
+    pub metadata: *mut PyObject,
+    #[cfg(Numpy_2_0)]
+    pub hash: npy_hash_t,
+    #[cfg(Numpy_2_0)]
+    pub reserved_null: [*mut c_void; 2],
 }
 
 #[repr(C)]
@@ -365,11 +385,31 @@ pub struct PyUFuncObject {
     pub core_offsets: *mut c_int,
     pub core_signature: *mut c_char,
     pub type_resolver: PyUFunc_TypeResolutionFunc,
-    pub legacy_inner_loop_selector: PyUFunc_LegacyInnerLoopSelectionFunc,
-    pub reserved2: *mut c_void,
-    pub masked_inner_loop_selector: PyUFunc_MaskedInnerLoopSelectionFunc,
+    pub dict: *mut PyObject,
+
+    #[cfg(all(Py_3_8, not(Py_LIMITED_API)))]
+    pub vectorcall: Option<vectorcallfunc>,
+    #[cfg(any(not(Py_3_8), Py_LIMITED_API))]
+    pub vectorcall: *mut c_void,
+
+    pub reserved3: *mut c_void,
     pub op_flags: *mut npy_uint32,
     pub iter_flags: npy_uint32,
+
+    #[cfg(Numpy_1_16)]
+    pub core_dim_sizes: *mut npy_intp,
+    #[cfg(Numpy_1_16)]
+    pub core_dim_flags: *mut npy_uint32,
+    #[cfg(Numpy_1_16)]
+    pub identity_value: *mut PyObject,
+
+    #[cfg(Numpy_1_22)]
+    pub _dispatch_cache: *mut c_void,
+    #[cfg(Numpy_1_22)]
+    pub _loops: *mut PyObject,
+
+    #[cfg(Numpy_2_1)]
+    pub process_core_dims_func: PyUFunc_ProcessCoreDimsFunc,
 }
 
 pub type PyUFuncGenericFunction =
@@ -415,6 +455,9 @@ pub type PyUFunc_MaskedInnerLoopSelectionFunc = Option<
     ) -> c_int,
 >;
 
+pub type PyUFunc_ProcessCoreDimsFunc =
+    Option<unsafe extern "C" fn(*mut PyUFuncObject, *mut npy_intp) -> c_int>;
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct NpyIter([u8; 0]);

src/npyffi/types.rs

@@ -154,6 +154,9 @@ pub enum NPY_SELECTKIND {
     NPY_INTROSELECT = 0,
 }
 
+#[cfg(Numpy_2_4)]
+pub const NPY_SAME_VALUE_CASTING_FLAG: u32 = 64;
+
 #[repr(u32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum NPY_CASTING {
@@ -162,6 +165,9 @@ pub enum NPY_CASTING {
     NPY_SAFE_CASTING = 2,
     NPY_SAME_KIND_CASTING = 3,
     NPY_UNSAFE_CASTING = 4,
+
+    #[cfg(Numpy_2_4)]
+    NPY_SAME_VALUE_CASTING = Self::NPY_UNSAFE_CASTING as u32 | NPY_SAME_VALUE_CASTING_FLAG,
 }
 
 #[repr(u32)]