X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_logic.c;h=d126d7b420cd058aa89f5ec248c4aef1e8339313;hp=a33d9976dc5d42ba7b216abab39d0581ab9ff91a;hb=991c44f33a55733610f6d9da1efbcc5bf1074dee;hpb=f6c7eade2b8853b3d525b5cc0402e89ca74c1908 diff --git a/type_logic.c b/type_logic.c index a33d997..d126d7b 100644 --- a/type_logic.c +++ b/type_logic.c @@ -17,9 +17,9 @@ * along with this program. If not, see . */ +#include #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */ #include "libsigrokdecode.h" -#include "config.h" #include #include @@ -73,14 +73,25 @@ static PyObject *srd_logic_iternext(PyObject *self) return logic->sample; } -/** @cond PRIVATE */ -SRD_PRIV PyTypeObject srd_logic_type = { - PyVarObject_HEAD_INIT(NULL, 0) - .tp_name = "srd_logic", - .tp_basicsize = sizeof(srd_logic), - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "Sigrokdecode logic sample object", - .tp_iter = srd_logic_iter, - .tp_iternext = srd_logic_iternext, -}; -/** @endcond */ +/** Create the srd_logic type. + * @return The new type object. + * @private + */ +SRD_PRIV PyObject *srd_logic_type_new(void) +{ + PyType_Spec spec; + PyType_Slot slots[] = { + { Py_tp_doc, "sigrokdecode logic sample object" }, + { Py_tp_iter, (void *)&srd_logic_iter }, + { Py_tp_iternext, (void *)&srd_logic_iternext }, + { Py_tp_new, (void *)&PyType_GenericNew }, + { 0, NULL } + }; + spec.name = "srd_logic"; + spec.basicsize = sizeof(srd_logic); + spec.itemsize = 0; + spec.flags = Py_TPFLAGS_DEFAULT; + spec.slots = slots; + + return PyType_FromSpec(&spec); +}