diff options
| -rw-r--r-- | numpy/fft/fftpack_litemodule.c | 2 | ||||
| -rw-r--r-- | numpy/lib/src/_compiled_base.c | 2 | ||||
| -rw-r--r-- | numpy/linalg/lapack_litemodule.c | 2 | ||||
| -rw-r--r-- | numpy/numarray/_capi.c | 70 |
4 files changed, 55 insertions, 21 deletions
diff --git a/numpy/fft/fftpack_litemodule.c b/numpy/fft/fftpack_litemodule.c index 3375976d6..123a44416 100644 --- a/numpy/fft/fftpack_litemodule.c +++ b/numpy/fft/fftpack_litemodule.c @@ -298,7 +298,7 @@ static struct PyMethodDef fftpack_methods[] = { {"rfftf", fftpack_rfftf, 1, fftpack_rfftf__doc__}, {"rfftb", fftpack_rfftb, 1, fftpack_rfftb__doc__}, {"rffti", fftpack_rffti, 1, fftpack_rffti__doc__}, - {NULL, NULL} /* sentinel */ + {NULL, NULL, 0, NULL} /* sentinel */ }; diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c index a103fe8d0..3a8193f63 100644 --- a/numpy/lib/src/_compiled_base.c +++ b/numpy/lib/src/_compiled_base.c @@ -889,7 +889,7 @@ static struct PyMethodDef methods[] = { METH_VARARGS | METH_KEYWORDS, NULL}, {"unpackbits", (PyCFunction)io_unpack, METH_VARARGS | METH_KEYWORDS, NULL}, - {NULL, NULL} /* sentinel */ + {NULL, NULL, 0, NULL} /* sentinel */ }; static void diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c index a3ab42466..5f7f08359 100644 --- a/numpy/linalg/lapack_litemodule.c +++ b/numpy/linalg/lapack_litemodule.c @@ -815,7 +815,7 @@ static struct PyMethodDef lapack_lite_module_methods[] = { lameth(zpotrf), lameth(zgeqrf), lameth(zungqr), - { NULL,NULL,0} + { NULL,NULL,0, NULL} }; static char lapack_lite_module_documentation[] = ""; diff --git a/numpy/numarray/_capi.c b/numpy/numarray/_capi.c index f93618aed..e51986981 100644 --- a/numpy/numarray/_capi.c +++ b/numpy/numarray/_capi.c @@ -922,22 +922,56 @@ cfunc_repr(PyObject *self) } static PyTypeObject CfuncType = { - PyObject_HEAD_INIT(NULL) - 0, - "Cfunc", - sizeof(CfuncObject), - 0, - cfunc_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - cfunc_repr, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - cfunc_call, /* tp_call */ + PyObject_HEAD_INIT(NULL) + 0, + "Cfunc", + sizeof(CfuncObject), + 0, + cfunc_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + cfunc_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + cfunc_call, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + 0, /* tp_flags */ + 0, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ + 0, /* tp_del */ +#if PY_VERSION_HEX >= 0x02060000 + 0, /* tp_version_tag */ +#endif }; /* CfuncObjects are created at the c-level only. They ensure that each @@ -3119,7 +3153,7 @@ typedef struct } scipy_typestr; static scipy_typestr scipy_descriptors[ ] = { - { tAny, ""}, + { tAny, "", 0}, { tBool, "b1", 1}, @@ -3306,7 +3340,7 @@ void *libnumarray_API[] = { #if (!defined(METHOD_TABLE_EXISTS)) static PyMethodDef _libnumarrayMethods[] = { - {NULL, NULL} /* Sentinel */ + {NULL, NULL, 0, NULL} /* Sentinel */ }; #endif |