From 963e1813220579e84b2b3c6a9019cc82bf7b4957 Mon Sep 17 00:00:00 2001 Message-Id: <963e1813220579e84b2b3c6a9019cc82bf7b4957.1715962099.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 20 Apr 2017 01:58:05 +0100 Subject: [PATCH] group.c: Track Catacomb group internals change. Organization: Straylight/Edgeware From: Mark Wooding --- group.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/group.c b/group.c index 7d5b257..ba59a8a 100644 --- a/group.c +++ b/group.c @@ -449,6 +449,12 @@ static PyTypeObject bindhinfo_pytype_skel = { PyTypeObject *ge_pytype, *group_pytype; PyTypeObject *primegroup_pytype, *bingroup_pytype, *ecgroup_pytype; +#ifdef GROUP_GUTS_MPSTRUCT +# define GG_GEN(gg) ((gg)->gen.x) +#else +# define GG_GEN(gg) ((gg)->gen) +#endif + group *group_copy(group *g) { if (strcmp(G_NAME(g), "prime") == 0) { @@ -1122,7 +1128,7 @@ static PyObject *pgget_info(PyObject *me, void *hunoz) gctx_prime *gg = (gctx_prime *)GROUP_G(me); dp.p = MP_COPY(gg->mm.m); dp.q = MP_COPY(gg->g.r); - dp.g = mpmont_reduce(&gg->mm, MP_NEW, gg->gen); + dp.g = mpmont_reduce(&gg->mm, MP_NEW, GG_GEN(gg)); return (fginfo_pywrap(&dp, dhinfo_pytype)); } @@ -1199,7 +1205,7 @@ static PyObject *bgget_info(PyObject *me, void *hunoz) gctx_bin *gg = (gctx_bin *)GROUP_G(me); dp.p = MP_COPY(gg->r.p); dp.q = MP_COPY(gg->g.r); - dp.g = MP_COPY(gg->gen); + dp.g = MP_COPY(GG_GEN(gg)); return (fginfo_pywrap(&dp, bindhinfo_pytype)); } -- [mdw]