bindings: regenerate bindings with FLINT 3.1.3-p1

Author: oscarbenjamin

src/flint/flintlib/functions/acb_poly.pxd

@@ -236,6 +236,7 @@ cdef extern from "flint/acb_poly.h":
     void acb_poly_root_bound_fujiwara(mag_t bound, acb_poly_t poly)
     void _acb_poly_root_inclusion(acb_t r, const acb_t m, acb_srcptr poly, acb_srcptr polyder, slong len, slong prec)
     slong _acb_poly_validate_roots(acb_ptr roots, acb_srcptr poly, slong len, slong prec)
+    void _acb_poly_refine_roots_durand_kerner(acb_ptr roots, acb_srcptr poly, slong len, slong prec)
     slong _acb_poly_find_roots(acb_ptr roots, acb_srcptr poly, acb_srcptr initial, slong len, slong maxiter, slong prec)
     slong acb_poly_find_roots(acb_ptr roots, const acb_poly_t poly, acb_srcptr initial, slong maxiter, slong prec)
     int _acb_poly_validate_real_roots(acb_srcptr roots, acb_srcptr poly, slong len, slong prec)

src/flint/flintlib/functions/arb.pxd

@@ -1,6 +1,6 @@
 from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
 from flint.flintlib.types.arf cimport arf_rnd_t, arf_srcptr, arf_t
-from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, nn_ptr, nn_srcptr, slong, ulong
+from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, mp_limb_t, mp_ptr, mp_size_t, mp_srcptr, slong, ulong
 from flint.flintlib.types.fmpq cimport fmpq_t
 
 # unknown type FILE
@@ -318,14 +318,14 @@ cdef extern from "flint/arb.h":
     void arb_partitions_ui(arb_t res, ulong n, slong prec)
     void arb_primorial_nth_ui(arb_t res, ulong n, slong prec)
     void arb_primorial_ui(arb_t res, ulong n, slong prec)
-    void _arb_atan_taylor_naive(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N, int alternating)
-    void _arb_atan_taylor_rs(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N, int alternating)
-    void _arb_exp_taylor_naive(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N)
-    void _arb_exp_taylor_rs(nn_ptr y, ulong * error, nn_srcptr x, slong xn, ulong N)
-    void _arb_sin_cos_taylor_naive(nn_ptr ysin, nn_ptr ycos, ulong * error, nn_srcptr x, slong xn, ulong N)
-    void _arb_sin_cos_taylor_rs(nn_ptr ysin, nn_ptr ycos, ulong * error, nn_srcptr x, slong xn, ulong N, int sinonly, int alternating)
-    int _arb_get_mpn_fixed_mod_log2(nn_ptr w, fmpz_t q, ulong * error, const arf_t x, slong wn)
-    int _arb_get_mpn_fixed_mod_pi4(nn_ptr w, fmpz_t q, int * octant, ulong * error, const arf_t x, slong wn)
+    void _arb_atan_taylor_naive(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N, int alternating)
+    void _arb_atan_taylor_rs(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N, int alternating)
+    void _arb_exp_taylor_naive(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N)
+    void _arb_exp_taylor_rs(mp_ptr y, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N)
+    void _arb_sin_cos_taylor_naive(mp_ptr ysin, mp_ptr ycos, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N)
+    void _arb_sin_cos_taylor_rs(mp_ptr ysin, mp_ptr ycos, mp_limb_t * error, mp_srcptr x, mp_size_t xn, ulong N, int sinonly, int alternating)
+    int _arb_get_mpn_fixed_mod_log2(mp_ptr w, fmpz_t q, mp_limb_t * error, const arf_t x, mp_size_t wn)
+    int _arb_get_mpn_fixed_mod_pi4(mp_ptr w, fmpz_t q, int * octant, mp_limb_t * error, const arf_t x, mp_size_t wn)
     slong _arb_exp_taylor_bound(slong mag, slong prec)
     void arb_exp_arf_bb(arb_t z, const arf_t x, slong prec, int m1)
     void _arb_exp_sum_bs_simple(fmpz_t T, fmpz_t Q, flint_bitcnt_t * Qexp, const fmpz_t x, flint_bitcnt_t r, slong N)

src/flint/flintlib/functions/arf.pxd

@@ -1,6 +1,6 @@
 from flint.flintlib.types.arb cimport mag_t
 from flint.flintlib.types.arf cimport arf_rnd_t, arf_srcptr, arf_t
-from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, nn_ptr, nn_srcptr, slong, ulong
+from flint.flintlib.types.flint cimport flint_rand_t, fmpz_t, mp_limb_t, mp_ptr, mp_size_t, mp_srcptr, slong, ulong
 from flint.flintlib.types.fmpq cimport fmpq_t
 
 # unknown type FILE
@@ -161,8 +161,8 @@ cdef extern from "flint/arf.h":
     int arf_complex_mul(arf_t e, arf_t f, const arf_t a, const arf_t b, const arf_t c, const arf_t d, slong prec, arf_rnd_t rnd)
     int arf_complex_mul_fallback(arf_t e, arf_t f, const arf_t a, const arf_t b, const arf_t c, const arf_t d, slong prec, arf_rnd_t rnd)
     int arf_complex_sqr(arf_t e, arf_t f, const arf_t a, const arf_t b, slong prec, arf_rnd_t rnd)
-    int _arf_get_integer_mpn(nn_ptr y, nn_srcptr xp, slong xn, slong exp)
-    int _arf_set_mpn_fixed(arf_t z, nn_srcptr xp, slong xn, slong fixn, int negative, slong prec, arf_rnd_t rnd)
+    int _arf_get_integer_mpn(mp_ptr y, mp_srcptr xp, mp_size_t xn, slong exp)
+    int _arf_set_mpn_fixed(arf_t z, mp_srcptr xp, mp_size_t xn, mp_size_t fixn, int negative, slong prec, arf_rnd_t rnd)
     int _arf_set_round_ui(arf_t z, ulong x, int sgnbit, slong prec, arf_rnd_t rnd)
-    int _arf_set_round_uiui(arf_t z, slong * fix, ulong hi, ulong lo, int sgnbit, slong prec, arf_rnd_t rnd)
-    int _arf_set_round_mpn(arf_t z, slong * exp_shift, nn_srcptr x, slong xn, int sgnbit, slong prec, arf_rnd_t rnd)
+    int _arf_set_round_uiui(arf_t z, slong * fix, mp_limb_t hi, mp_limb_t lo, int sgnbit, slong prec, arf_rnd_t rnd)
+    int _arf_set_round_mpn(arf_t z, slong * exp_shift, mp_srcptr x, mp_size_t xn, int sgnbit, slong prec, arf_rnd_t rnd)

src/flint/flintlib/functions/arith.pxd

@@ -1,4 +1,4 @@
-from flint.flintlib.types.flint cimport fmpz_struct, fmpz_t, nmod_t, nn_ptr, slong, ulong
+from flint.flintlib.types.flint cimport fmpz_struct, fmpz_t, mp_limb_t, mp_ptr, nmod_t, slong, ulong
 from flint.flintlib.types.fmpq cimport fmpq_poly_t, fmpq_struct, fmpq_t
 from flint.flintlib.types.fmpz cimport fmpz_mat_t, fmpz_poly_t
 
@@ -7,6 +7,7 @@ from flint.flintlib.types.fmpz cimport fmpz_mat_t, fmpz_poly_t
 
 
 cdef extern from "flint/arith.h":
+    void arith_primorial(fmpz_t res, slong n)
     void _arith_harmonic_number(fmpz_t num, fmpz_t den, slong n)
     void arith_harmonic_number(fmpq_t x, slong n)
     void arith_stirling_number_1u(fmpz_t s, ulong n, ulong k)
@@ -27,11 +28,11 @@ cdef extern from "flint/arith.h":
     void arith_bell_number_vec(fmpz_struct * b, slong n)
     void arith_bell_number_vec_recursive(fmpz_struct * b, slong n)
     void arith_bell_number_vec_multi_mod(fmpz_struct * b, slong n)
-    ulong arith_bell_number_nmod(ulong n, nmod_t mod)
-    void arith_bell_number_nmod_vec(nn_ptr b, slong n, nmod_t mod)
-    void arith_bell_number_nmod_vec_recursive(nn_ptr b, slong n, nmod_t mod)
-    void arith_bell_number_nmod_vec_ogf(nn_ptr b, slong n, nmod_t mod)
-    int arith_bell_number_nmod_vec_series(nn_ptr b, slong n, nmod_t mod)
+    mp_limb_t arith_bell_number_nmod(ulong n, nmod_t mod)
+    void arith_bell_number_nmod_vec(mp_ptr b, slong n, nmod_t mod)
+    void arith_bell_number_nmod_vec_recursive(mp_ptr b, slong n, nmod_t mod)
+    void arith_bell_number_nmod_vec_ogf(mp_ptr b, slong n, nmod_t mod)
+    int arith_bell_number_nmod_vec_series(mp_ptr b, slong n, nmod_t mod)
     double arith_bell_number_size(ulong n)
     void _arith_bernoulli_number(fmpz_t num, fmpz_t den, ulong n)
     void arith_bernoulli_number(fmpq_t x, ulong n)
@@ -46,14 +47,22 @@ cdef extern from "flint/arith.h":
     void arith_euler_number_vec(fmpz_struct * res, slong n)
     double arith_euler_number_size(ulong n)
     void arith_euler_polynomial(fmpq_poly_t poly, ulong n)
+    void arith_euler_phi(fmpz_t res, const fmpz_t n)
+    int arith_moebius_mu(const fmpz_t n)
+    void arith_divisor_sigma(fmpz_t res, ulong k, const fmpz_t n)
     void arith_divisors(fmpz_poly_t res, const fmpz_t n)
     void arith_ramanujan_tau(fmpz_t res, const fmpz_t n)
     void arith_ramanujan_tau_series(fmpz_poly_t res, slong n)
     void arith_landau_function_vec(fmpz_struct * res, slong len)
+    void arith_dedekind_sum_naive(fmpq_t s, const fmpz_t h, const fmpz_t k)
+    double arith_dedekind_sum_coprime_d(double h, double k)
+    void arith_dedekind_sum_coprime_large(fmpq_t s, const fmpz_t h, const fmpz_t k)
+    void arith_dedekind_sum_coprime(fmpq_t s, const fmpz_t h, const fmpz_t k)
+    void arith_dedekind_sum(fmpq_t s, const fmpz_t h, const fmpz_t k)
     void arith_number_of_partitions_vec(fmpz_struct * res, slong len)
-    void arith_number_of_partitions_nmod_vec(nn_ptr res, slong len, nmod_t mod)
+    void arith_number_of_partitions_nmod_vec(mp_ptr res, slong len, nmod_t mod)
     # void trig_prod_init(trig_prod_t prod)
-    # void arith_hrr_expsum_factored(trig_prod_t prod, ulong k, ulong n)
+    # void arith_hrr_expsum_factored(trig_prod_t prod, mp_limb_t k, mp_limb_t n)
     # void arith_number_of_partitions_mpfr(mpfr_t x, ulong n)
     void arith_number_of_partitions(fmpz_t x, ulong n)
     void arith_sum_of_squares(fmpz_t r, ulong k, const fmpz_t n)

src/flint/flintlib/functions/fmpq_mpoly.pxd

@@ -1,4 +1,4 @@
-from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, slong, ulong
+from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, mp_limb_t, slong, ulong
 from flint.flintlib.types.fmpq cimport fmpq_mpoly_ctx_t, fmpq_mpoly_struct, fmpq_mpoly_t, fmpq_poly_struct, fmpq_poly_t, fmpq_struct, fmpq_t
 from flint.flintlib.types.fmpz cimport fmpz_mpoly_struct
 from flint.flintlib.types.mpoly cimport ordering_t
@@ -95,9 +95,9 @@ cdef extern from "flint/fmpq_mpoly.h":
     void fmpq_mpoly_sort_terms(fmpq_mpoly_t A, const fmpq_mpoly_ctx_t ctx)
     void fmpq_mpoly_combine_like_terms(fmpq_mpoly_t A, const fmpq_mpoly_ctx_t ctx)
     void fmpq_mpoly_reverse(fmpq_mpoly_t A, const fmpq_mpoly_t B, const fmpq_mpoly_ctx_t ctx)
-    void fmpq_mpoly_randtest_bound(fmpq_mpoly_t A, flint_rand_t state, slong length, ulong coeff_bits, ulong exp_bound, const fmpq_mpoly_ctx_t ctx)
-    void fmpq_mpoly_randtest_bounds(fmpq_mpoly_t A, flint_rand_t state, slong length, ulong coeff_bits, ulong * exp_bounds, const fmpq_mpoly_ctx_t ctx)
-    void fmpq_mpoly_randtest_bits(fmpq_mpoly_t A, flint_rand_t state, slong length, ulong coeff_bits, ulong exp_bits, const fmpq_mpoly_ctx_t ctx)
+    void fmpq_mpoly_randtest_bound(fmpq_mpoly_t A, flint_rand_t state, slong length, mp_limb_t coeff_bits, ulong exp_bound, const fmpq_mpoly_ctx_t ctx)
+    void fmpq_mpoly_randtest_bounds(fmpq_mpoly_t A, flint_rand_t state, slong length, mp_limb_t coeff_bits, ulong * exp_bounds, const fmpq_mpoly_ctx_t ctx)
+    void fmpq_mpoly_randtest_bits(fmpq_mpoly_t A, flint_rand_t state, slong length, mp_limb_t coeff_bits, mp_limb_t exp_bits, const fmpq_mpoly_ctx_t ctx)
     void fmpq_mpoly_add_fmpq(fmpq_mpoly_t A, const fmpq_mpoly_t B, const fmpq_t c, const fmpq_mpoly_ctx_t ctx)
     void fmpq_mpoly_add_fmpz(fmpq_mpoly_t A, const fmpq_mpoly_t B, const fmpz_t c, const fmpq_mpoly_ctx_t ctx)
     void fmpq_mpoly_add_ui(fmpq_mpoly_t A, const fmpq_mpoly_t B, ulong c, const fmpq_mpoly_ctx_t ctx)

src/flint/flintlib/functions/fmpz.pxd

@@ -1,31 +1,30 @@
-from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, nmod_t, nn_ptr, nn_srcptr, slong, ulong
+from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, fmpz_t, mp_limb_t, mp_ptr, mp_size_t, mp_srcptr, nmod_t, slong, ulong
 from flint.flintlib.types.fmpz cimport fmpz_factor_t, fmpz_preinvn_t
 
 # unknown type FILE
+# unknown type __mpz_struct
 # unknown type fmpz_comb_t
 # unknown type fmpz_comb_temp_t
 # unknown type fmpz_multi_CRT_t
 # unknown type mpf_t
 # unknown type mpfr_rnd_t
 # unknown type mpfr_t
-# unknown type mpz_ptr
 # unknown type mpz_t
 # unknown type size_t
 
 # .. macro:: COEFF_MAX
 # .. macro:: COEFF_MIN
 # .. macro:: COEFF_IS_MPZ(f)
-# .. macro:: MPZ_MIN_ALLOC
 
 cdef extern from "flint/fmpz.h":
-    # fmpz_struct PTR_TO_COEFF(mpz_ptr ptr)
-    # mpz_ptr COEFF_TO_PTR(fmpz_struct f)
-    # mpz_ptr _fmpz_new_mpz(void)
+    # fmpz_struct PTR_TO_COEFF(__mpz_struct * ptr)
+    # __mpz_struct * COEFF_TO_PTR(fmpz_struct f)
+    # __mpz_struct * _fmpz_new_mpz(void)
     void _fmpz_clear_mpz(fmpz_struct f)
     void _fmpz_cleanup_mpz_content()
     void _fmpz_cleanup()
-    # mpz_ptr _fmpz_promote(fmpz_t f)
-    # mpz_ptr _fmpz_promote_val(fmpz_t f)
+    # __mpz_struct * _fmpz_promote(fmpz_t f)
+    # __mpz_struct * _fmpz_promote_val(fmpz_t f)
     void _fmpz_demote(fmpz_t f)
     void _fmpz_demote_val(fmpz_t f)
     int _fmpz_is_canonical(const fmpz_t f)
@@ -35,45 +34,43 @@ cdef extern from "flint/fmpz.h":
     void fmpz_init_set(fmpz_t f, const fmpz_t g)
     void fmpz_init_set_ui(fmpz_t f, ulong g)
     void fmpz_init_set_si(fmpz_t f, slong g)
-    void fmpz_randbits_unsigned(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randbits(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
-    void fmpz_randtest_unsigned(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randtest(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
+    void fmpz_randtest_unsigned(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randtest_not_zero(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randm(fmpz_t f, flint_rand_t state, const fmpz_t m)
     void fmpz_randtest_mod(fmpz_t f, flint_rand_t state, const fmpz_t m)
     void fmpz_randtest_mod_signed(fmpz_t f, flint_rand_t state, const fmpz_t m)
     void fmpz_randprime(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits, int proved)
     slong fmpz_get_si(const fmpz_t f)
     ulong fmpz_get_ui(const fmpz_t f)
-    void fmpz_get_uiui(ulong * hi, ulong * low, const fmpz_t f)
-    ulong fmpz_get_nmod(const fmpz_t f, nmod_t mod)
+    void fmpz_get_uiui(mp_limb_t * hi, mp_limb_t * low, const fmpz_t f)
+    mp_limb_t fmpz_get_nmod(const fmpz_t f, nmod_t mod)
     double fmpz_get_d(const fmpz_t f)
     # void fmpz_set_mpf(fmpz_t f, const mpf_t x)
     # void fmpz_get_mpf(mpf_t x, const fmpz_t f)
     # void fmpz_get_mpfr(mpfr_t x, const fmpz_t f, mpfr_rnd_t rnd)
     double fmpz_get_d_2exp(slong * exp, const fmpz_t f)
     # void fmpz_get_mpz(mpz_t x, const fmpz_t f)
-    int fmpz_get_mpn(nn_ptr * n, fmpz_t n_in)
+    int fmpz_get_mpn(mp_ptr * n, fmpz_t n_in)
     char * fmpz_get_str(char * str, int b, const fmpz_t f)
     void fmpz_set_si(fmpz_t f, slong val)
     void fmpz_set_ui(fmpz_t f, ulong val)
     void fmpz_set_d(fmpz_t f, double c)
     void fmpz_set_d_2exp(fmpz_t f, double d, slong exp)
     void fmpz_neg_ui(fmpz_t f, ulong val)
-    void fmpz_set_uiui(fmpz_t f, ulong hi, ulong lo)
-    void fmpz_neg_uiui(fmpz_t f, ulong hi, ulong lo)
+    void fmpz_set_uiui(fmpz_t f, mp_limb_t hi, mp_limb_t lo)
+    void fmpz_neg_uiui(fmpz_t f, mp_limb_t hi, mp_limb_t lo)
     void fmpz_set_signed_uiui(fmpz_t f, ulong hi, ulong lo)
     void fmpz_set_signed_uiuiui(fmpz_t f, ulong hi, ulong mid, ulong lo)
     void fmpz_set_ui_array(fmpz_t out, const ulong * in_, slong n)
     void fmpz_set_signed_ui_array(fmpz_t out, const ulong * in_, slong n)
     void fmpz_get_ui_array(ulong * out, slong n, const fmpz_t in_)
     void fmpz_get_signed_ui_array(ulong * out, slong n, const fmpz_t in_)
-    void fmpz_set_mpn_large(fmpz_t z, nn_srcptr src, slong n, int negative)
     void fmpz_get_signed_uiui(ulong * hi, ulong * lo, const fmpz_t in_)
     # void fmpz_set_mpz(fmpz_t f, const mpz_t x)
     int fmpz_set_str(fmpz_t f, const char * str, int b)
-    void fmpz_set_ui_smod(fmpz_t f, ulong x, ulong m)
+    void fmpz_set_ui_smod(fmpz_t f, mp_limb_t x, mp_limb_t m)
     # void flint_mpz_init_set_readonly(mpz_t z, const fmpz_t f)
     # void flint_mpz_clear_readonly(mpz_t z)
     # void fmpz_init_set_readonly(fmpz_t f, const mpz_t z)
@@ -86,7 +83,7 @@ cdef extern from "flint/fmpz.h":
     # size_t fmpz_out_raw(FILE * fout, const fmpz_t x )
     # size_t fmpz_sizeinbase(const fmpz_t f, int b)
     flint_bitcnt_t fmpz_bits(const fmpz_t f)
-    slong fmpz_size(const fmpz_t f)
+    mp_size_t fmpz_size(const fmpz_t f)
     int fmpz_sgn(const fmpz_t f)
     flint_bitcnt_t fmpz_val2(const fmpz_t f)
     void fmpz_swap(fmpz_t f, fmpz_t g)
@@ -97,8 +94,8 @@ cdef extern from "flint/fmpz.h":
     int fmpz_fits_si(const fmpz_t f)
     void fmpz_setbit(fmpz_t f, ulong i)
     int fmpz_tstbit(const fmpz_t f, ulong i)
-    ulong fmpz_abs_lbound_ui_2exp(slong * exp, const fmpz_t x, int bits)
-    ulong fmpz_abs_ubound_ui_2exp(slong * exp, const fmpz_t x, int bits)
+    mp_limb_t fmpz_abs_lbound_ui_2exp(slong * exp, const fmpz_t x, int bits)
+    mp_limb_t fmpz_abs_ubound_ui_2exp(slong * exp, const fmpz_t x, int bits)
     int fmpz_cmp(const fmpz_t f, const fmpz_t g)
     int fmpz_cmp_ui(const fmpz_t f, ulong g)
     int fmpz_cmp_si(const fmpz_t f, slong g)
@@ -209,9 +206,9 @@ cdef extern from "flint/fmpz.h":
     int fmpz_jacobi(const fmpz_t a, const fmpz_t n)
     int fmpz_kronecker(const fmpz_t a, const fmpz_t n)
     void fmpz_divides_mod_list(fmpz_t xstart, fmpz_t xstride, fmpz_t xlength, const fmpz_t a, const fmpz_t b, const fmpz_t n)
-    int fmpz_bit_pack(ulong * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, const fmpz_t coeff, int negate, int borrow)
-    int fmpz_bit_unpack(fmpz_t coeff, ulong * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, int negate, int borrow)
-    void fmpz_bit_unpack_unsigned(fmpz_t coeff, const ulong * arr, flint_bitcnt_t shift, flint_bitcnt_t bits)
+    int fmpz_bit_pack(mp_limb_t * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, const fmpz_t coeff, int negate, int borrow)
+    int fmpz_bit_unpack(fmpz_t coeff, mp_limb_t * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, int negate, int borrow)
+    void fmpz_bit_unpack_unsigned(fmpz_t coeff, const mp_limb_t * arr, flint_bitcnt_t shift, flint_bitcnt_t bits)
     void fmpz_complement(fmpz_t r, const fmpz_t f)
     void fmpz_clrbit(fmpz_t f, ulong i)
     void fmpz_combit(fmpz_t f, ulong i)
@@ -221,9 +218,9 @@ cdef extern from "flint/fmpz.h":
     ulong fmpz_popcnt(const fmpz_t a)
     void fmpz_CRT_ui(fmpz_t out, const fmpz_t r1, const fmpz_t m1, ulong r2, ulong m2, int sign)
     void fmpz_CRT(fmpz_t out, const fmpz_t r1, const fmpz_t m1, const fmpz_t r2, const fmpz_t m2, int sign)
-    # void fmpz_multi_mod_ui(ulong * out, const fmpz_t in_, const fmpz_comb_t comb, fmpz_comb_temp_t temp)
-    # void fmpz_multi_CRT_ui(fmpz_t output, nn_srcptr residues, const fmpz_comb_t comb, fmpz_comb_temp_t ctemp, int sign)
-    # void fmpz_comb_init(fmpz_comb_t comb, nn_srcptr primes, slong num_primes)
+    # void fmpz_multi_mod_ui(mp_limb_t * out, const fmpz_t in_, const fmpz_comb_t comb, fmpz_comb_temp_t temp)
+    # void fmpz_multi_CRT_ui(fmpz_t output, mp_srcptr residues, const fmpz_comb_t comb, fmpz_comb_temp_t ctemp, int sign)
+    # void fmpz_comb_init(fmpz_comb_t comb, mp_srcptr primes, slong num_primes)
     # void fmpz_comb_temp_init(fmpz_comb_temp_t temp, const fmpz_comb_t comb)
     # void fmpz_comb_clear(fmpz_comb_t comb)
     # void fmpz_comb_temp_clear(fmpz_comb_temp_t temp)
@@ -237,10 +234,10 @@ cdef extern from "flint/fmpz.h":
     int fmpz_is_probabprime_BPSW(const fmpz_t n)
     int fmpz_is_probabprime(const fmpz_t p)
     int fmpz_is_prime_pseudosquare(const fmpz_t n)
-    int fmpz_is_prime_pocklington(fmpz_t F, fmpz_t R, const fmpz_t n, nn_ptr pm1, slong num_pm1)
-    void _fmpz_nm1_trial_factors(const fmpz_t n, nn_ptr pm1, slong * num_pm1, ulong limit)
-    int fmpz_is_prime_morrison(fmpz_t F, fmpz_t R, const fmpz_t n, nn_ptr pp1, slong num_pp1)
-    void _fmpz_np1_trial_factors(const fmpz_t n, nn_ptr pp1, slong * num_pp1, ulong limit)
+    int fmpz_is_prime_pocklington(fmpz_t F, fmpz_t R, const fmpz_t n, mp_ptr pm1, slong num_pm1)
+    void _fmpz_nm1_trial_factors(const fmpz_t n, mp_ptr pm1, slong * num_pm1, ulong limit)
+    int fmpz_is_prime_morrison(fmpz_t F, fmpz_t R, const fmpz_t n, mp_ptr pp1, slong num_pp1)
+    void _fmpz_np1_trial_factors(const fmpz_t n, mp_ptr pp1, slong * num_pp1, ulong limit)
     int fmpz_is_prime(const fmpz_t n)
     void fmpz_lucas_chain(fmpz_t Vm, fmpz_t Vm1, const fmpz_t A, const fmpz_t m, const fmpz_t n)
     void fmpz_lucas_chain_full(fmpz_t Vm, fmpz_t Vm1, const fmpz_t A, const fmpz_t B, const fmpz_t m, const fmpz_t n)