X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/d7ab1bab81155baa763449d5afa81e16df98dbe7..ecc5edeeffc8726f9b14708ae4cb6183a2e80da6:/pgen.c

diff --git a/pgen.c b/pgen.c
index e201b62..68830f1 100644
--- a/pgen.c
+++ b/pgen.c
@@ -68,7 +68,7 @@ static PyObject *pfilt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 }
 
 static void pfilt_pydealloc(PyObject *me)
-  { pfilt_destroy(PFILT_F(me)); PyObject_DEL(me); }
+  { pfilt_destroy(PFILT_F(me)); FREEOBJ(me); }
 
 static PyObject *pfmeth_step(PyObject *me, PyObject *arg)
 {
@@ -198,7 +198,7 @@ static PyNumberMethods pfilt_pynumber = {
 };
 
 static PyTypeObject pfilt_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
   "catacomb.PrimeFilter",		/* @tp_name@ */
   sizeof(pfilt_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -241,7 +241,7 @@ static PyTypeObject pfilt_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   pfilt_pynew,				/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };
 
@@ -273,7 +273,7 @@ end:
 static void rabin_pydealloc(PyObject *me)
 {
   rabin_destroy(RABIN_R(me));
-  PyObject_DEL(me);
+  FREEOBJ(me);
 }
 
 static PyObject *rmeth_test(PyObject *me, PyObject *arg)
@@ -331,7 +331,7 @@ static PyMethodDef rabin_pymethods[] = {
 };
 
 static PyTypeObject rabin_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
   "catacomb.RabinMiller",		/* @tp_name@ */
   sizeof(rabin_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -374,7 +374,7 @@ static PyTypeObject rabin_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   rabin_pynew,				/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };
 
@@ -398,7 +398,7 @@ static PyObject *pgevent_pywrap(pgen_event *ev)
 static CONVFUNC(pgevent, pgen_event *, PGEVENT_EV)
 
 static void pgevent_kill(PyObject *me) { PGEVENT_EV(me) = 0; }
-static void pgevent_pydealloc(PyObject *me) { PyObject_DEL(me); }
+static void pgevent_pydealloc(PyObject *me) { FREEOBJ(me); }
 
 #define PGEVENT_CHECK(me) do {						\
   if (!PGEVENT_EV(me)) {						\
@@ -449,7 +449,7 @@ static PyGetSetDef pgevent_pygetset[] = {
 };
 
 static PyTypeObject pgevent_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
   "catacomb.PrimeGenEvent",		/* @tp_name@ */
   sizeof(pgevent_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -492,7 +492,7 @@ static PyTypeObject pgevent_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   abstract_pynew,			/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };
 
@@ -630,12 +630,12 @@ static PyMethodDef pgev_pymethods[] = {
 };
 
 static PyTypeObject pgev_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
   "catacomb.PrimeGenBuiltinHandler",	/* @tp_name@ */
   sizeof(pgev_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
-  _PyObject_Del,			/* @tp_dealloc@ */
+  0,					/* @tp_dealloc@ */
   0,					/* @tp_print@ */
   0,					/* @tp_getattr@ */
   0,					/* @tp_setattr@ */
@@ -673,7 +673,7 @@ static PyTypeObject pgev_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   abstract_pynew,			/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };
 
@@ -704,7 +704,7 @@ static PyGetSetDef pgstep_pygetset[] = {
 };
 
 static PyTypeObject pgstep_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
   "catacomb.PrimeGenStepper",		/* @tp_name@ */
   sizeof(pgstep_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -747,7 +747,7 @@ static PyTypeObject pgstep_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   pgstep_pynew,				/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };
 
@@ -772,7 +772,7 @@ end:
 static void pgjump_pydealloc(PyObject *me)
 {
   Py_DECREF(PGJUMP_FOBJ(me));
-  _PyObject_Del(me);
+  FREEOBJ(me);
 }
 
 static PyObject *pjget_jump(PyObject *me, void *hunoz)
@@ -786,7 +786,7 @@ static PyGetSetDef pgjump_pygetset[] = {
 };
 
 static PyTypeObject pgjump_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
   "catacomb.PrimeGenJumper",		/* @tp_name@ */
   sizeof(pgjump_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -829,7 +829,7 @@ static PyTypeObject pgjump_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   pgjump_pynew,				/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };
 
@@ -847,7 +847,7 @@ end:
 }
 
 static PyTypeObject pgtest_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
+  PyObject_HEAD_INIT(0) 0,		/* Header */
   "catacomb.PrimeGenTester",		/* @tp_name@ */
   sizeof(pgtest_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -890,7 +890,7 @@ static PyTypeObject pgtest_pytype_skel = {
   0,					/* @tp_init@ */
   PyType_GenericAlloc,			/* @tp_alloc@ */
   pgtest_pynew,				/* @tp_new@ */
-  _PyObject_Del,			/* @tp_free@ */
+  0,					/* @tp_free@ */
   0					/* @tp_is_gc@ */
 };