X-Git-Url: https://git.distorted.org.uk/~mdw/pyke/blobdiff_plain/1b6734b68d788a57b9491360a3ca8dfebeae60bc..2ad160b18bafeedcf82a229846326224638edd67:/catacomb-python.h diff --git a/catacomb-python.h b/catacomb-python.h index 5c012ef..0949562 100644 --- a/catacomb-python.h +++ b/catacomb-python.h @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -155,10 +156,11 @@ #define root_pytype 0 #define type_pytype &PyType_Type -#define INITTYPE(ty, base) do { \ +#define INITTYPE_META(ty, base, meta) do { \ ty##_pytype_skel.tp_base = base##_pytype; \ - ty##_pytype = inittype(&ty##_pytype_skel); \ + ty##_pytype = inittype(&ty##_pytype_skel, meta##_pytype); \ } while (0) +#define INITTYPE(ty, base) INITTYPE_META(ty, base, type) #define INSERT(name, ob) do { \ PyObject *_o = (PyObject *)(ob); \ @@ -246,7 +248,7 @@ extern void *newtype(PyTypeObject *, const PyTypeObject *, const char *); extern PyObject *mkexc(PyObject *, PyObject *, const char *, PyMethodDef *); extern void typeready(PyTypeObject *); -extern PyTypeObject *inittype(PyTypeObject *); +extern PyTypeObject *inittype(PyTypeObject *, PyTypeObject *); extern void addmethods(const PyMethodDef *); extern PyMethodDef *donemethods(void);