diff --git a/acb_calc/integrate_gl_auto_deg.c b/acb_calc/integrate_gl_auto_deg.c index 9b79e7e0..47e641e5 100644 --- a/acb_calc/integrate_gl_auto_deg.c +++ b/acb_calc/integrate_gl_auto_deg.c @@ -243,7 +243,7 @@ acb_calc_integrate_gl_auto_deg(acb_t res, slong * eval_count, if (verbose) { acb_get_mag(tmpm, delta); - flint_printf(" {GL deg %ld on [", best_n); + flint_printf(" {GL deg %wd on [", best_n); acb_printn(a, 10, ARB_STR_NO_RADIUS); flint_printf(", "); acb_printn(b, 10, ARB_STR_NO_RADIUS); flint_printf("], delta "); mag_printd(tmpm, 5); diff --git a/acb_dft.h b/acb_dft.h index 94b4ff65..8c66cea0 100644 --- a/acb_dft.h +++ b/acb_dft.h @@ -317,7 +317,11 @@ acb_vec_printd_index(acb_srcptr vec, slong len, slong digits) { slong i; for (i = 0; i < len; i++) - flint_printf("[%ld] ",i), acb_printd(vec + i, digits), flint_printf("\n"); + { + flint_printf("[%wd] ", i); + acb_printd(vec + i, digits); + flint_printf("\n"); + } } #ifdef __cplusplus diff --git a/acb_dft/convol_rad2.c b/acb_dft/convol_rad2.c index 0d12f50e..2344759b 100644 --- a/acb_dft/convol_rad2.c +++ b/acb_dft/convol_rad2.c @@ -19,7 +19,7 @@ acb_dft_convol_pad(acb_ptr fp, acb_ptr gp, acb_srcptr f, acb_srcptr g, slong n, if (np < 2 * n - 1) { - flint_printf("dft_convol_pad: overlapping padding %ld < 2*%ld-1\n", np, n); + flint_printf("dft_convol_pad: overlapping padding %wd < 2*%wd-1\n", np, n); abort(); } diff --git a/acb_dft/naive.c b/acb_dft/naive.c index 20dd382a..e2377568 100644 --- a/acb_dft/naive.c +++ b/acb_dft/naive.c @@ -82,7 +82,7 @@ _acb_dft_naive_init(acb_dft_naive_t pol, slong dv, acb_ptr z, slong dz, slong le if (z == NULL) { if (DFT_VERB) - flint_printf("dft_naive: init z[%ld]\n",len); + flint_printf("dft_naive: init z[%wd]\n",len); pol->z = _acb_vec_init(len); _acb_vec_unit_roots(pol->z, -len, len, prec); pol->dz = 1; diff --git a/acb_dft/rad2_threaded.c b/acb_dft/rad2_threaded.c index bc24db25..2f0e0100 100644 --- a/acb_dft/rad2_threaded.c +++ b/acb_dft/rad2_threaded.c @@ -102,7 +102,7 @@ acb_dft_rad2_precomp_inplace_threaded(acb_ptr v, const acb_dft_rad2_t rad2, slon } if (i != t) { - flint_printf("threaded dft error: unequal i=%ld t=%ld\n", i, t); + flint_printf("threaded dft error: unequal i=%wd t=%wd\n", i, t); flint_abort(); } for (i = 0; i < t; i++) diff --git a/acb_dft/test/t-convol.c b/acb_dft/test/t-convol.c index fded6ce2..d311aa31 100644 --- a/acb_dft/test/t-convol.c +++ b/acb_dft/test/t-convol.c @@ -23,8 +23,8 @@ check_vec_eq_prec(acb_srcptr w1, acb_srcptr w2, slong len, slong prec, slong dig if (!acb_overlaps(w1 + i, w2 + i)) { flint_printf("FAIL\n\n"); - flint_printf("q = %wu, size = %wu\n", q, len); - flint_printf("\nDFT differ from index %ld / %ld \n", i, len); + flint_printf("q = %wu, size = %wd\n", q, len); + flint_printf("\nDFT differ from index %wd / %wd \n", i, len); flint_printf("\n%s =\n", f1); acb_vec_printd_index(w1, len, digits); flint_printf("\n%s =\n", f2); @@ -37,12 +37,12 @@ check_vec_eq_prec(acb_srcptr w1, acb_srcptr w2, slong len, slong prec, slong dig { flint_printf("FAIL\n\n"); flint_printf("q = %wu\n", q); - flint_printf("\nDFT inaccurate from index %ld / %ld \n", i, len); + flint_printf("\nDFT inaccurate from index %wd / %wd \n", i, len); flint_printf("\n%s =\n", f1); acb_printd(w1 + i, digits); flint_printf("\n%s =\n", f2); acb_printd(w2 + i, digits); - flint_printf("\nerrors %ld & %ld [prec = %wu]\n", + flint_printf("\nerrors %wd & %wd [prec = %wd]\n", acb_rel_accuracy_bits(w1 + i), acb_rel_accuracy_bits(w2 + i), prec); abort(); diff --git a/acb_dft/test/t-dft.c b/acb_dft/test/t-dft.c index 516808fc..31c875ab 100644 --- a/acb_dft/test/t-dft.c +++ b/acb_dft/test/t-dft.c @@ -23,8 +23,8 @@ check_vec_eq_prec(acb_srcptr w1, acb_srcptr w2, slong len, slong prec, slong dig if (!acb_overlaps(w1 + i, w2 + i)) { flint_printf("FAIL\n\n"); - flint_printf("q = %wu, size = %wu\n", q, len); - flint_printf("\nDFT %s differ from index %ld / %ld \n", d, i, len); + flint_printf("q = %wu, size = %wd\n", q, len); + flint_printf("\nDFT %s differ from index %wd / %wd \n", d, i, len); flint_printf("\n%s =\n", f1); acb_vec_printd_index(w1, len, digits); flint_printf("\n%s =\n", f2); @@ -37,12 +37,12 @@ check_vec_eq_prec(acb_srcptr w1, acb_srcptr w2, slong len, slong prec, slong dig { flint_printf("FAIL\n\n"); flint_printf("q = %wu\n", q); - flint_printf("\nDFT inaccurate from index %ld / %ld \n", i, len); + flint_printf("\nDFT inaccurate from index %wd / %wd \n", i, len); flint_printf("\n%s =\n", f1); acb_printd(w1 + i, digits); flint_printf("\n%s =\n", f2); acb_printd(w2 + i, digits); - flint_printf("\nerrors %ld & %ld [prec = %wu]\n", + flint_printf("\nerrors %wd & %wd [prec = %wd]\n", acb_rel_accuracy_bits(w1 + i), acb_rel_accuracy_bits(w2 + i), prec); abort(); diff --git a/acb_dirichlet/platt_multieval.c b/acb_dirichlet/platt_multieval.c index 1b832b6e..18b4628d 100644 --- a/acb_dirichlet/platt_multieval.c +++ b/acb_dirichlet/platt_multieval.c @@ -22,8 +22,8 @@ _acb_dot_arb(acb_t res, const acb_t initial, int subtract, arb_srcptr b, c; if (sizeof(acb_struct) != 2*sizeof(arb_struct)) { - flint_printf("expected sizeof(acb_struct)=%ld " - "to be twice sizeof(arb_struct)=%ld\n", + flint_printf("expected sizeof(acb_struct)=%zu " + "to be twice sizeof(arb_struct)=%zu\n", sizeof(acb_struct), sizeof(arb_struct)); flint_abort(); } diff --git a/acb_dirichlet/test/t-backlund_s_gram.c b/acb_dirichlet/test/t-backlund_s_gram.c index 0b70f104..edac7894 100644 --- a/acb_dirichlet/test/t-backlund_s_gram.c +++ b/acb_dirichlet/test/t-backlund_s_gram.c @@ -54,7 +54,7 @@ int main() flint_printf("FAIL: containment\n\n"); flint_printf("n = "); fmpz_print(n); flint_printf(" prec1 = %wd prec2 = %wd\n\n", prec1, prec2); - flint_printf("S = %ld\n\n", S); + flint_printf("S = %wd\n\n", S); flint_printf("t = "); arb_printn(t, 100, 0); flint_printf("\n\n"); flint_printf("x = "); arb_printn(x, 100, 0); flint_printf("\n\n"); flint_abort(); diff --git a/acb_dirichlet/test/t-dft.c b/acb_dirichlet/test/t-dft.c index 66c98aa5..822e4b41 100644 --- a/acb_dirichlet/test/t-dft.c +++ b/acb_dirichlet/test/t-dft.c @@ -23,8 +23,8 @@ check_vec_eq_prec(acb_srcptr w1, acb_srcptr w2, slong len, slong prec, slong dig if (!acb_overlaps(w1 + i, w2 + i)) { flint_printf("FAIL\n\n"); - flint_printf("q = %wu, size = %wu\n", q, len); - flint_printf("\nDFT differ from index %ld / %ld \n", i, len); + flint_printf("q = %wu, size = %wd\n", q, len); + flint_printf("\nDFT differ from index %wd / %wd \n", i, len); flint_printf("\n%s =\n", f1); acb_vec_printd(w1, len, digits); flint_printf("\n%s =\n", f2); @@ -37,12 +37,12 @@ check_vec_eq_prec(acb_srcptr w1, acb_srcptr w2, slong len, slong prec, slong dig { flint_printf("FAIL\n\n"); flint_printf("q = %wu\n", q); - flint_printf("\nDFT inaccurate from index %ld / %ld \n", i, len); + flint_printf("\nDFT inaccurate from index %wd / %wd \n", i, len); flint_printf("\nnaive =\n"); acb_printd(w1 + i, digits); flint_printf("\nfast =\n"); acb_printd(w2 + i, digits); - flint_printf("\nerrors %ld & %ld [prec = %wu]\n", + flint_printf("\nerrors %wd & %wd [prec = %wd]\n", acb_rel_accuracy_bits(w1 + i), acb_rel_accuracy_bits(w2 + i), prec); abort(); diff --git a/acb_dirichlet/test/t-l.c b/acb_dirichlet/test/t-l.c index 580d7867..9e707577 100644 --- a/acb_dirichlet/test/t-l.c +++ b/acb_dirichlet/test/t-l.c @@ -52,7 +52,7 @@ int main() if (!acb_overlaps(t, u)) { flint_printf("FAIL: overlap\n\n"); - flint_printf("iter = %ld q = %lu k = %lu prec = %ld\n\n", iter, q, k, prec); + flint_printf("iter = %wd q = %wu k = %wu prec = %wd\n\n", iter, q, k, prec); flint_printf("s = "); acb_printn(s, 100, 0); flint_printf("\n\n"); flint_printf("t = "); acb_printn(t, 100, 0); flint_printf("\n\n"); flint_printf("u = "); acb_printn(u, 100, 0); flint_printf("\n\n"); diff --git a/acb_dirichlet/test/t-l_euler_product.c b/acb_dirichlet/test/t-l_euler_product.c index 04c7f8c7..0655c70a 100644 --- a/acb_dirichlet/test/t-l_euler_product.c +++ b/acb_dirichlet/test/t-l_euler_product.c @@ -63,7 +63,7 @@ int main() if (!acb_overlaps(t, u)) { flint_printf("FAIL: overlap\n\n"); - flint_printf("iter = %ld q = %lu k = %lu prec = %ld\n\n", iter, q, k, prec); + flint_printf("iter = %wd q = %wu k = %wu prec = %wd\n\n", iter, q, k, prec); flint_printf("s = "); acb_printn(s, 100, 0); flint_printf("\n\n"); flint_printf("t = "); acb_printn(t, 100, 0); flint_printf("\n\n"); flint_printf("u = "); acb_printn(u, 100, 0); flint_printf("\n\n"); diff --git a/acb_dirichlet/test/t-l_hurwitz.c b/acb_dirichlet/test/t-l_hurwitz.c index 70044f38..158d54d7 100644 --- a/acb_dirichlet/test/t-l_hurwitz.c +++ b/acb_dirichlet/test/t-l_hurwitz.c @@ -81,7 +81,7 @@ int main() if (arb_set_str(acb_realref(x + j), x_r[j], prec) || arb_set_str(acb_imagref(x + j), x_i[j], prec) ) { - flint_printf("error while setting x[%ld] <- %s+I*%s\n", + flint_printf("error while setting x[%wd] <- %s+I*%s\n", j, x_r[j], x_i[j]); flint_abort(); } diff --git a/acb_dirichlet/test/t-l_vec_hurwitz.c b/acb_dirichlet/test/t-l_vec_hurwitz.c index 42b9e879..e5cc7649 100644 --- a/acb_dirichlet/test/t-l_vec_hurwitz.c +++ b/acb_dirichlet/test/t-l_vec_hurwitz.c @@ -93,7 +93,7 @@ int main() acb_printd(z, 30); flint_printf("\ndft =\n"); acb_printd(v + i, 30); - flint_printf("\nerrors %ld & %ld [prec = %wu]\n", + flint_printf("\nerrors %wd & %wd [prec = %wd]\n", acb_rel_accuracy_bits(z), acb_rel_accuracy_bits(v + i), prec); abort(); diff --git a/acb_dirichlet/test/t-turing_method_bound.c b/acb_dirichlet/test/t-turing_method_bound.c index 740ff5bc..e36b6e9e 100644 --- a/acb_dirichlet/test/t-turing_method_bound.c +++ b/acb_dirichlet/test/t-turing_method_bound.c @@ -43,8 +43,8 @@ int main() flint_printf("FAIL: increasing on p >= -1\n\n"); flint_printf("a = "); fmpz_print(a); flint_printf("\n\n"); flint_printf("b = "); fmpz_print(b); flint_printf("\n\n"); - flint_printf("u = %lu\n", u); - flint_printf("v = %lu\n", v); + flint_printf("u = %wu\n", u); + flint_printf("v = %wu\n", v); flint_abort(); } diff --git a/acb_hypgeom/test/t-gamma_upper.c b/acb_hypgeom/test/t-gamma_upper.c index 7ae67fe0..32577cc1 100644 --- a/acb_hypgeom/test/t-gamma_upper.c +++ b/acb_hypgeom/test/t-gamma_upper.c @@ -22,8 +22,8 @@ _accuracy_regression_test(const acb_t s, const acb_t z, acb_hypgeom_gamma_upper(g, s, z, regularized, prec); if (acb_rel_accuracy_bits(g) < accuracy) { - flint_printf("FAIL: accuracy regression in issue #%ld\n\n", issue); - flint_printf("prec = %d\n\n", prec); + flint_printf("FAIL: accuracy regression in issue #%wd\n\n", issue); + flint_printf("prec = %wd\n\n", prec); flint_printf("regularized = %d\n\n", regularized); flint_printf("s = "); acb_printd(s, 30); flint_printf("\n\n"); flint_printf("z = "); acb_printd(z, 30); flint_printf("\n\n"); diff --git a/arb/test/t-can_round_mpfr.c b/arb/test/t-can_round_mpfr.c index 12a7e52f..539b4649 100644 --- a/arb/test/t-can_round_mpfr.c +++ b/arb/test/t-can_round_mpfr.c @@ -62,7 +62,7 @@ int main() if (r1 != r2 || !mpfr_equal_p(y1, y2)) { - flint_printf("FAIL! %ld\n"); + flint_printf("FAIL!\n"); flint_printf("r1 = %d, r2 = %d, prec = %wd\n", r1, r2, prec); flint_printf("x = "); mpfr_dump(x); flint_printf("\n"); flint_printf("y1 = "); mpfr_dump(y1); flint_printf("\n"); diff --git a/arb/test/t-sin_cos_arf_bb.c b/arb/test/t-sin_cos_arf_bb.c index a40328dc..7cd907d8 100644 --- a/arb/test/t-sin_cos_arf_bb.c +++ b/arb/test/t-sin_cos_arf_bb.c @@ -138,7 +138,7 @@ int main() if (arb_rel_accuracy_bits(s2) < prec - 2 || arb_rel_accuracy_bits(c2) < prec - 2) { flint_printf("FAIL: poor accuracy\n\n"); - flint_printf("prec = %wd, acc1 = %wd, acc2 = %d\n\n", + flint_printf("prec = %wd, acc1 = %wd, acc2 = %wd\n\n", prec, arb_rel_accuracy_bits(s2), arb_rel_accuracy_bits(c2)); flint_printf("x = "); arb_printn(x, 500, 0); flint_printf("\n\n"); flint_printf("s1 = "); arb_printn(s1, 500, 0); flint_printf("\n\n"); diff --git a/arb/test/t-sin_cos_arf_generic.c b/arb/test/t-sin_cos_arf_generic.c index 974b5a1c..54d6f3d5 100644 --- a/arb/test/t-sin_cos_arf_generic.c +++ b/arb/test/t-sin_cos_arf_generic.c @@ -91,7 +91,7 @@ int main() (arb_rel_accuracy_bits(s2) < prec - 2 || arb_rel_accuracy_bits(c2) < prec - 2)) { flint_printf("FAIL: poor accuracy\n\n"); - flint_printf("prec = %wd, acc1 = %wd, acc2 = %d\n\n", + flint_printf("prec = %wd, acc1 = %wd, acc2 = %wd\n\n", prec, arb_rel_accuracy_bits(s2), arb_rel_accuracy_bits(c2)); flint_printf("x = "); arb_printn(x, 500, 0); flint_printf("\n\n"); flint_printf("s1 = "); arb_printn(s1, 500, 0); flint_printf("\n\n"); @@ -175,7 +175,7 @@ int main() if (arb_rel_accuracy_bits(s2) < prec - 2 || arb_rel_accuracy_bits(c2) < prec - 2) { flint_printf("FAIL: poor accuracy\n\n"); - flint_printf("prec = %wd, acc1 = %wd, acc2 = %d\n\n", + flint_printf("prec = %wd, acc1 = %wd, acc2 = %wd\n\n", prec, arb_rel_accuracy_bits(s2), arb_rel_accuracy_bits(c2)); flint_printf("x = "); arb_printn(x, 500, 0); flint_printf("\n\n"); flint_printf("s1 = "); arb_printn(s1, 500, 0); flint_printf("\n\n"); diff --git a/arf/test/t-add_si.c b/arf/test/t-add_si.c index 03516d6f..053760d3 100644 --- a/arf/test/t-add_si.c +++ b/arf/test/t-add_si.c @@ -72,7 +72,7 @@ int main() r2 = arf_add_si_naive(v, x, y, prec, rnd); if (!arf_equal(z, v) || r1 != r2) { - flint_printf("FAIL! (ha iter %ld, %ld)\n", iter, iter2); + flint_printf("FAIL! (ha iter %wd, %wd)\n", iter, iter2); flint_printf("prec = %wd, rnd = %d\n\n", prec, rnd); flint_printf("x = "); arf_print(x); flint_printf("\n\n"); flint_printf("y = "); flint_printf("%wd", y); flint_printf("\n\n");