From: mdw <mdw>
Date: Sun, 10 Apr 2005 23:38:11 +0000 (+0000)
Subject: Various minor fixings.
X-Git-Tag: 1.0.1~53
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/commitdiff_plain/5d00a630f70ecca03dee379f2b049eb80e8bf28e?ds=sidebyside

Various minor fixings.
---

diff --git a/catacomb.c b/catacomb.c
index 742ce5f..acc0e35 100644
--- a/catacomb.c
+++ b/catacomb.c
@@ -238,7 +238,12 @@ static const PyTypeObject emptytype = { 0 };
 
 void *newtype(PyTypeObject *metaty, const PyTypeObject *skel)
 {
-  PyTypeObject *ty = (PyTypeObject *)_PyObject_GC_Malloc(metaty, 0);
+  PyTypeObject *ty =
+#if PY_VERSION_HEX < 0x02030000
+    (PyTypeObject *)_PyObject_GC_Malloc(metaty, 0);
+#else
+    (PyTypeObject *)_PyObject_GC_Malloc(_PyObject_VAR_SIZE(metaty, 0));
+#endif
   if (!skel) skel = &emptytype;
   memcpy(ty, skel, sizeof(*skel));
   if (ty->tp_base) Py_INCREF(ty->tp_base);
diff --git a/group.c b/group.c
index 9049bba..f3a01ab 100644
--- a/group.c
+++ b/group.c
@@ -1323,7 +1323,7 @@ static PyMethodDef methods[] = {
   METH	(_DHInfo__groupn,	0)
   METH	(_BinDHInfo__groupn,	0)
   KWMETH(_DHInfo_generate,	"\
-generate(PBITS, [qbits = 0, event = pgen_nullev,
+generate(PBITS, [qbits = 0, event = pgen_nullev,\n\
          rng = rand, nsteps = 0]) -> D")
   KWMETH(_DHInfo_genlimlee,	"\
 genlimlee(PBITS, QBITS, [event = pgen_nullev, ievent = pgen_nullev,\n\