Fixing for Python 2.3 and later.

[catacomb-python] / pgen.c

diff --git a/pgen.c b/pgen.c
index e201b6263c1f98ca6797e9d9e420fa596e8248ae..a2b7634ca239cfc35084c1632dbef7fe23000066 100644 (file)
--- 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)
 {
@@ -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)
@@ -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)) {                                               \
@@ -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@ */
 };
 
@@ -635,7 +635,7 @@ static PyTypeObject pgev_pytype_skel = {
   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@ */
 };
 
@@ -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)
@@ -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@ */
 };
 
@@ -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@ */
 };