Merge pull request numpy#27663 from kp2pml30/fix-function-pointer-has-incompatible-type

seberg · web-flow · commit 3fcac502eba9 · 2024-10-29T19:38:42.000+01:00
MAINT: fix wasm32 runtime type error in numpy._core
diff --git a/numpy/_core/src/multiarray/dtypemeta.c b/numpy/_core/src/multiarray/dtypemeta.c
@@ -1256,22 +1256,22 @@ dtypemeta_wrap_legacy_descriptor(
 
 
 static PyObject *
-dtypemeta_get_abstract(PyArray_DTypeMeta *self) {
+dtypemeta_get_abstract(PyArray_DTypeMeta *self, void *NPY_UNUSED(ignored)) {
     return PyBool_FromLong(NPY_DT_is_abstract(self));
 }
 
 static PyObject *
-dtypemeta_get_legacy(PyArray_DTypeMeta *self) {
+dtypemeta_get_legacy(PyArray_DTypeMeta *self, void *NPY_UNUSED(ignored)) {
     return PyBool_FromLong(NPY_DT_is_legacy(self));
 }
 
 static PyObject *
-dtypemeta_get_parametric(PyArray_DTypeMeta *self) {
+dtypemeta_get_parametric(PyArray_DTypeMeta *self, void *NPY_UNUSED(ignored)) {
     return PyBool_FromLong(NPY_DT_is_parametric(self));
 }
 
 static PyObject *
-dtypemeta_get_is_numeric(PyArray_DTypeMeta *self) {
+dtypemeta_get_is_numeric(PyArray_DTypeMeta *self, void *NPY_UNUSED(ignored)) {
     return PyBool_FromLong(NPY_DT_is_numeric(self));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1256,22 +1256,22 @@ dtypemeta_wrap_legacy_descriptor(`
`1256`	`1256`
`1257`	`1257`
`1258`	`1258`	`static PyObject *`
`1259`		`-dtypemeta_get_abstract(PyArray_DTypeMeta *self) {`
	`1259`	`+dtypemeta_get_abstract(PyArray_DTypeMeta self, void NPY_UNUSED(ignored)) {`
`1260`	`1260`	`return PyBool_FromLong(NPY_DT_is_abstract(self));`
`1261`	`1261`	`}`
`1262`	`1262`
`1263`	`1263`	`static PyObject *`
`1264`		`-dtypemeta_get_legacy(PyArray_DTypeMeta *self) {`
	`1264`	`+dtypemeta_get_legacy(PyArray_DTypeMeta self, void NPY_UNUSED(ignored)) {`
`1265`	`1265`	`return PyBool_FromLong(NPY_DT_is_legacy(self));`
`1266`	`1266`	`}`
`1267`	`1267`
`1268`	`1268`	`static PyObject *`
`1269`		`-dtypemeta_get_parametric(PyArray_DTypeMeta *self) {`
	`1269`	`+dtypemeta_get_parametric(PyArray_DTypeMeta self, void NPY_UNUSED(ignored)) {`
`1270`	`1270`	`return PyBool_FromLong(NPY_DT_is_parametric(self));`
`1271`	`1271`	`}`
`1272`	`1272`
`1273`	`1273`	`static PyObject *`
`1274`		`-dtypemeta_get_is_numeric(PyArray_DTypeMeta *self) {`
	`1274`	`+dtypemeta_get_is_numeric(PyArray_DTypeMeta self, void NPY_UNUSED(ignored)) {`
`1275`	`1275`	`return PyBool_FromLong(NPY_DT_is_numeric(self));`
`1276`	`1276`	`}`
`1277`	`1277`