Merge pull request #76 from mezzarobba/flint3

Make msolve build with flint 3 alpha
algebraic-solving · Sep 15, 2023 · 0fb562f · 0fb562f
2 parents 19233e2 + fe73057
commit 0fb562f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/fglm/berlekamp_massey.c b/src/fglm/berlekamp_massey.c
@@ -30,6 +30,9 @@
 */
 
 #include <stdlib.h>
+#if __FLINT_VERSION >= 3
+#  include <flint/nmod.h>
+#endif
 //#include "nmod_poly.h"
 //#include "mpn_extras.h"
 

diff --git a/src/fglm/data_fglm.c b/src/fglm/data_fglm.c
@@ -24,6 +24,7 @@
 #include <flint/mpn_extras.h>
 #include <flint/nmod_poly.h>
 #include <flint/nmod_poly_factor.h>
+#include <flint/ulong_extras.h>
 
 
 typedef uint32_t szmat_t;
@@ -299,9 +300,11 @@ static inline void nmod_poly_set_prime(nmod_poly_t poly,
   mp_limb_t ninv = n_preinvert_limb(prime);
   poly->mod.n = prime;
   poly->mod.ninv = ninv;
+#if __FLINT_VERSION < 3
   count_leading_zeros(poly->mod.norm, prime);
-  /* poly->mod.norm = flint_clz(prime); */
-
+#else
+  poly->mod.norm = flint_clz(prime);
+#endif
 }
 
 static inline void fglm_param_set_prime(param_t *param, mp_limb_t prime){