X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/cc36f2d8913cf55b43ed32d3f2f06622906038af..2aa7d3a9238bfb3d117ca23191ea402c5c5d6f40:/pgen.c

diff --git a/pgen.c b/pgen.c
index 291d289..777ec32 100644
--- a/pgen.c
+++ b/pgen.c
@@ -196,7 +196,7 @@ static const PyNumberMethods pfilt_pynumber = {
 };
 
 static const PyTypeObject pfilt_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeFilter",			/* @tp_name@ */
   sizeof(pfilt_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -330,7 +330,7 @@ static const PyMethodDef rabin_pymethods[] = {
 };
 
 static const PyTypeObject rabin_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "RabinMiller",			/* @tp_name@ */
   sizeof(rabin_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -419,7 +419,7 @@ static void pgevent_pydealloc(PyObject *me)
 } while (0)
 
 static PyObject *peget_name(PyObject *me, void *hunoz)
-  { PGEVENT_CHECK(me); return (PyString_FromString(PGEVENT_EV(me)->name)); }
+  { PGEVENT_CHECK(me); return (TEXT_FROMSTR(PGEVENT_EV(me)->name)); }
 
 static PyObject *peget_x(PyObject *me, void *hunoz)
   { PGEVENT_CHECK(me); return (mp_pywrap(MP_COPY(PGEVENT_EV(me)->m))); }
@@ -467,7 +467,7 @@ static const PyGetSetDef pgevent_pygetset[] = {
 };
 
 static const PyTypeObject pgevent_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenEvent",			/* @tp_name@ */
   sizeof(pgevent_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -646,7 +646,7 @@ static const PyMethodDef pgev_pymethods[] = {
 };
 
 static const PyTypeObject pgev_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenBuiltinHandler",		/* @tp_name@ */
   sizeof(pgev_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -720,7 +720,7 @@ static const PyGetSetDef pgstep_pygetset[] = {
 };
 
 static const PyTypeObject pgstep_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenStepper",			/* @tp_name@ */
   sizeof(pgstep_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -802,7 +802,7 @@ static const PyGetSetDef pgjump_pygetset[] = {
 };
 
 static const PyTypeObject pgjump_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenJumper",			/* @tp_name@ */
   sizeof(pgjump_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -864,7 +864,7 @@ end:
 }
 
 static const PyTypeObject pgtest_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "PrimeGenTester",			/* @tp_name@ */
   sizeof(pgtest_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */