Fix for Cygwin.

diff --git a/algorithms.c b/algorithms.c
index 0a36f910740dcc0cd0ab83e2038479c5291b9f94..2113cc5a171ccd3e5fcbd435980474232332cc5e 100644 (file)
--- a/algorithms.c
+++ b/algorithms.c
@@ -231,7 +231,7 @@ static PyMemberDef keyszset_pymembers[] = {
 };
 
 static PyTypeObject keysz_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KeySZ",                    /* @tp_name@ */
   sizeof(keysz_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -279,7 +279,7 @@ static PyTypeObject keysz_pytype_skel = {
 };
 
 static PyTypeObject keyszany_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KeySZAny",                 /* @tp_name@ */
   sizeof(keysz_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -327,7 +327,7 @@ static PyTypeObject keyszany_pytype_skel = {
 };
 
 static PyTypeObject keyszrange_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KeySZRange",               /* @tp_name@ */
   sizeof(keyszrange_pyobj),            /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -376,7 +376,7 @@ sizes, and requires the key length to be a multiple of some value.",
 };
 
 static PyTypeObject keyszset_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KeySZSet",                 /* @tp_name@ */
   sizeof(keyszset_pyobj),              /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -590,7 +590,7 @@ static PyMethodDef gcipher_pymethods[] = {
 };
 
 static PyTypeObject gccipher_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GCCipher",                 /* @tp_name@ */
   sizeof(gccipher_pyobj),              /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -638,7 +638,7 @@ static PyTypeObject gccipher_pytype_skel = {
 };
 
 static PyTypeObject gcipher_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GCipher",                  /* @tp_name@ */
   sizeof(gcipher_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -786,7 +786,7 @@ static PyMethodDef ghash_pymethods[] = {
 };
 
 static PyTypeObject gchash_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GCHash",                   /* @tp_name@ */
   sizeof(gchash_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -834,7 +834,7 @@ static PyTypeObject gchash_pytype_skel = {
 };
 
 static PyTypeObject ghash_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GHash",                    /* @tp_name@ */
   sizeof(ghash_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -984,7 +984,7 @@ static PyGetSetDef gcmac_pygetset[] = {
 };
 
 static PyTypeObject gcmac_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GCMAC",                    /* @tp_name@ */
   sizeof(gchash_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1032,7 +1032,7 @@ static PyTypeObject gcmac_pytype_skel = {
 };
 
 static PyTypeObject gmac_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GMAC",                     /* @tp_name@ */
   sizeof(gmac_pyobj),                  /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1080,7 +1080,7 @@ static PyTypeObject gmac_pytype_skel = {
 };
 
 static PyTypeObject gmhash_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GMACHash",                 /* @tp_name@ */
   sizeof(ghash_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/bytestring.c b/bytestring.c
index 61627f4fb37f317b4ad91762a70bc9085417e578..394d2f99cbc62f0f9d759a61cd47625b8cf1fd32 100644 (file)
--- a/bytestring.c
+++ b/bytestring.c
@@ -117,7 +117,7 @@ static PyNumberMethods bytestring_pynumber = {
 static PyBufferProcs bytestring_pybuffer;
 
 static PyTypeObject bytestring_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ByteString",               /* @tp_name@ */
   0,                                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/ec.c b/ec.c
index c38c6c472eb3d33d99f01dc9602aa432adecd4c7..985e94d8b150a2745af4fb54a5dc24be2ee52a9c 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -589,7 +589,7 @@ static PyNumberMethods ecpt_pynumber = {
 };
 
 static PyTypeObject ecpt_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECPt",                     /* @tp_name@ */
   sizeof(ecpt_pyobj),                  /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -703,7 +703,7 @@ static PyNumberMethods ecptcurve_pynumber = {
 };
 
 static PyTypeObject ecptcurve_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECPtCurve",                        /* @tp_name@ */
   sizeof(ecpt_pyobj),                  /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1015,7 +1015,7 @@ E.mmul([(P0, N0), (P1, N1), ...]) = N0 P0 + N1 P1 + ...")
 };
 
 static PyTypeObject eccurve_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECCurve",                  /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1069,7 +1069,7 @@ static PyObject *ecprimecurve_pynew(PyTypeObject *ty,
 }
 
 static PyTypeObject ecprimecurve_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECPrimeCurve",             /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1123,7 +1123,7 @@ static PyObject *ecprimeprojcurve_pynew(PyTypeObject *ty,
 }
 
 static PyTypeObject ecprimeprojcurve_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECPrimeProjCurve",         /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1177,7 +1177,7 @@ static PyObject *ecbincurve_pynew(PyTypeObject *ty,
 }
 
 static PyTypeObject ecbincurve_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECBinCurve",               /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1231,7 +1231,7 @@ static PyObject *ecbinprojcurve_pynew(PyTypeObject *ty,
 }
 
 static PyTypeObject ecbinprojcurve_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECBinProjCurve",           /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1436,7 +1436,7 @@ static PyMethodDef ecinfo_pymethods[] = {
 };
 
 static PyTypeObject ecinfo_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECInfo",                   /* @tp_name@ */
   sizeof(ecinfo_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/field.c b/field.c
index 89fe8fbf2e26e01951542553f3f66bb955bb4571..9ea62dd413f26011ddc8d81448e8310db52dd78d 100644 (file)
--- a/field.c
+++ b/field.c
@@ -407,7 +407,7 @@ static PyNumberMethods fe_pynumber = {
 };
 
 static PyTypeObject fe_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.FE",                       /* @tp_name@ */
   sizeof(fe_pyobj),                    /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -537,7 +537,7 @@ static PyMethodDef field_pymethods[] = {
 };
 
 static PyTypeObject field_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.Field",                    /* @tp_name@ */
   sizeof(field_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -615,7 +615,7 @@ static PyGetSetDef primefield_pygetset[] = {
 };
 
 static PyTypeObject primefield_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.PrimeField",               /* @tp_name@ */
   sizeof(field_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -682,7 +682,7 @@ end:
 }
 
 static PyTypeObject niceprimefield_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.NicePrimeField",           /* @tp_name@ */
   sizeof(field_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -742,7 +742,7 @@ static PyGetSetDef binfield_pygetset[] = {
 };
 
 static PyTypeObject binfield_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.BinField",                 /* @tp_name@ */
   sizeof(field_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -815,7 +815,7 @@ static PyGetSetDef binpolyfield_pygetset[] = {
 };
 
 static PyTypeObject binpolyfield_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.BinPolyField",             /* @tp_name@ */
   sizeof(field_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -897,7 +897,7 @@ static PyGetSetDef binnormfield_pygetset[] = {
 };
 
 static PyTypeObject binnormfield_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.BinNormField",             /* @tp_name@ */
   sizeof(field_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/group.c b/group.c
index bb9e9e61db21283ea1969ecfaf22ae88b8b20972..461782c08a8a3c8a198335670ec20e386db45f22 100644 (file)
--- a/group.c
+++ b/group.c
@@ -276,7 +276,7 @@ static PyGetSetDef bindhinfo_pygetset[] = {
 };
 
 static PyTypeObject fginfo_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.FGInfo",                   /* @tp_name@ */
   sizeof(fginfo_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -324,7 +324,7 @@ static PyTypeObject fginfo_pytype_skel = {
 };
 
 static PyTypeObject dhinfo_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.DHInfo",                   /* @tp_name@ */
   sizeof(fginfo_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -372,7 +372,7 @@ static PyTypeObject dhinfo_pytype_skel = {
 };
 
 static PyTypeObject bindhinfo_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.BinDHInfo",                        /* @tp_name@ */
   sizeof(fginfo_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -960,7 +960,7 @@ static PyNumberMethods ge_pynumber = {
 };
 
 static PyTypeObject ge_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GE",                       /* @tp_name@ */
   sizeof(ge_pyobj),                    /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1030,7 +1030,7 @@ G.mexp([(X0, N0), (X1, N1), ...]) -> X0^N0 X1^N1 ...")
 };
 
 static PyTypeObject group_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.Group",                    /* @tp_name@ */
   sizeof(group_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1107,7 +1107,7 @@ static PyObject *primegroup_pynew(PyTypeObject *ty,
 }
 
 static PyTypeObject primegroup_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.PrimeGroup",               /* @tp_name@ */
   sizeof(group_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1184,7 +1184,7 @@ static PyObject *bingroup_pynew(PyTypeObject *ty,
 }
 
 static PyTypeObject bingroup_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.BinGroup",                 /* @tp_name@ */
   sizeof(group_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1262,7 +1262,7 @@ static PyObject *ecgroup_pynew(PyTypeObject *ty,
 }
 
 static PyTypeObject ecgroup_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.ECGroup",                  /* @tp_name@ */
   sizeof(group_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/mp.c b/mp.c
index e14b3a0d1d8a58b039b9a77bbc5abdcc82d59acb..5bfdcbfa80a280f996daca9119ca3ff16e1ad43c 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -810,7 +810,7 @@ static PyNumberMethods mp_pynumber = {
 };
 
 static PyTypeObject mp_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.MP",                       /* @tp_name@ */
   sizeof(mp_pyobj),                    /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1158,7 +1158,7 @@ B.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 mod B.m\n\
 };
 
 static PyTypeObject *mpmont_pytype, mpmont_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.MPMont",                   /* @tp_name@ */
   sizeof(mpmont_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1297,7 +1297,7 @@ B.mexp([(X0, N0), (X1, N1), ...]) = X0^N0 X1^N1 mod B.m\n\
 };
 
 static PyTypeObject *mpbarrett_pytype, mpbarrett_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.MPBarrett",                        /* @tp_name@ */
   sizeof(mpbarrett_pyobj),             /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1425,7 +1425,7 @@ static PyMethodDef mpreduce_pymethods[] = {
 };
 
 static PyTypeObject *mpreduce_pytype, mpreduce_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.MPReduce",                 /* @tp_name@ */
   sizeof(mpreduce_pyobj),              /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1594,7 +1594,7 @@ static PyMethodDef mpcrt_pymethods[] = {
 };
 
 static PyTypeObject *mpcrt_pytype, mpcrt_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.MPCRT",                    /* @tp_name@ */
   sizeof(mpcrt_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1876,7 +1876,7 @@ static PyNumberMethods gf_pynumber = {
 };
 
 static PyTypeObject gf_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GF",                       /* @tp_name@ */
   sizeof(mp_pyobj),                    /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -2042,7 +2042,7 @@ static PyMethodDef gfreduce_pymethods[] = {
 };
 
 static PyTypeObject *gfreduce_pytype, gfreduce_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GFReduce",                 /* @tp_name@ */
   sizeof(gfreduce_pyobj),              /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -2176,7 +2176,7 @@ static PyMethodDef gfn_pymethods[] = {
 };
 
 static PyTypeObject gfn_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GFN",                      /* @tp_name@ */
   sizeof(gfn_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/passphrase.c b/passphrase.c
index cf4d81ec4bfe0386cddb21c6e61f6f739b1dd80c..93a2073c7066dee12ed3d7c7951bbde81a9eb94f 100644 (file)
--- a/passphrase.c
+++ b/passphrase.c
@@ -130,7 +130,7 @@ static PyMethodDef pixie_pymethods[] = {
 };
 
 static PyTypeObject pixie_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.Pixie",                    /* @tp_name@ */
   sizeof(pixie_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/pgen.c b/pgen.c
index a2b7634ca239cfc35084c1632dbef7fe23000066..68830f1ebc7cf1f17defa04f56178002ca5dbeb0 100644 (file)
--- a/pgen.c
+++ b/pgen.c
@@ -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@ */
@@ -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@ */
@@ -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@ */
@@ -630,7 +630,7 @@ 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@ */
@@ -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@ */
@@ -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@ */
@@ -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@ */

diff --git a/pubkey.c b/pubkey.c
index ef44845ab7f8fd03d9c1cb53788f8101f6181c4c..862fe515ee28ac125dc869591cc8138bbd029bec 100644 (file)
--- a/pubkey.c
+++ b/pubkey.c
@@ -211,7 +211,7 @@ static PyMemberDef dsapriv_pymembers[] = {
 };
 
 static PyTypeObject dsapub_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.DSAPub",                   /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -259,7 +259,7 @@ static PyTypeObject dsapub_pytype_skel = {
 };
 
 static PyTypeObject dsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.DSAPriv",                  /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -424,7 +424,7 @@ static PyMethodDef kcdsapriv_pymethods[] = {
 };
 
 static PyTypeObject kcdsapub_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KCDSAPub",                 /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -472,7 +472,7 @@ static PyTypeObject kcdsapub_pytype_skel = {
 };
 
 static PyTypeObject kcdsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KCDSAPriv",                        /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -758,7 +758,7 @@ static PyMethodDef rsapriv_pymethods[] = {
 };
 
 static PyTypeObject rsapub_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.RSAPub",                   /* @tp_name@ */
   sizeof(rsapub_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -806,7 +806,7 @@ static PyTypeObject rsapub_pytype_skel = {
 };
 
 static PyTypeObject rsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.RSAPriv",                  /* @tp_name@ */
   sizeof(rsapriv_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/rand.c b/rand.c
index d4f1fd0757101a932677df1d954968f8277684a2..a28de1f772d85a4016a549858c93f40f177044f3 100644 (file)
--- a/rand.c
+++ b/rand.c
@@ -262,7 +262,7 @@ static PyMethodDef grand_pymethods[] = {
 };
 
 static PyTypeObject grand_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.GRand",                    /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -319,7 +319,7 @@ static PyObject *lcrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
 }
 
 static PyTypeObject lcrand_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.LCRand",                   /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -376,7 +376,7 @@ static PyObject *fibrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
 }
 
 static PyTypeObject fibrand_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.FibRand",                  /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -510,7 +510,7 @@ static PyGetSetDef truerand_pygetset[] = {
 };
 
 static PyTypeObject truerand_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.TrueRand",                 /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -611,7 +611,7 @@ end:
 }
 
 static PyTypeObject sslprf_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.SSLRand",                  /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -659,7 +659,7 @@ static PyTypeObject sslprf_pytype_skel = {
 };
 
 static PyTypeObject tlsdx_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.TLSDataExpansion",         /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -707,7 +707,7 @@ static PyTypeObject tlsdx_pytype_skel = {
 };
 
 static PyTypeObject tlsprf_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.TLSPRF",                   /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -787,7 +787,7 @@ static PyGetSetDef dsarand_pygetset[] = {
 };
 
 static PyTypeObject dsarand_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.DSARand",                  /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -918,7 +918,7 @@ static PyGetSetDef bbs_pygetset[] = {
 };
 
 static PyTypeObject bbs_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.BlumBlumShub",             /* @tp_name@ */
   sizeof(grand_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -1076,7 +1076,7 @@ static PyGetSetDef bbspriv_pygetset[] = {
 };
 
 static PyTypeObject bbspriv_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.BBSPriv",                  /* @tp_name@ */
   sizeof(bbspriv_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */

diff --git a/setup.py b/setup.py
index ad7577600498a7f4713b3c8ad2947c4bc52dd39f..0fa8848d40b148e2469ed8514e5e3951e87851d2 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -42,8 +42,8 @@ def uniquify(l):
 
 cflags = []
 libs = []
-libconfig('mLib', '2.0.3')
 libconfig('catacomb', '2.1.0')
+libconfig('mLib', '2.0.3')
 
 class SubprocessFailure (Exception):
   def __init__(me, file, rc):