diff options
Diffstat (limited to 'mpf')
-rw-r--r-- | mpf/clear.c | 2 | ||||
-rw-r--r-- | mpf/dump.c | 2 | ||||
-rw-r--r-- | mpf/get_str.c | 2 | ||||
-rw-r--r-- | mpf/init.c | 2 | ||||
-rw-r--r-- | mpf/init2.c | 2 | ||||
-rw-r--r-- | mpf/inp_str.c | 8 | ||||
-rw-r--r-- | mpf/iset.c | 2 | ||||
-rw-r--r-- | mpf/iset_d.c | 2 | ||||
-rw-r--r-- | mpf/iset_si.c | 2 | ||||
-rw-r--r-- | mpf/iset_str.c | 2 | ||||
-rw-r--r-- | mpf/iset_ui.c | 2 | ||||
-rw-r--r-- | mpf/set_prc.c | 2 | ||||
-rw-r--r-- | mpf/tests/t-conv.c | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/mpf/clear.c b/mpf/clear.c index 9e74153ab..a81b4d55e 100644 --- a/mpf/clear.c +++ b/mpf/clear.c @@ -31,5 +31,5 @@ mpf_clear (m) mpf_ptr m; #endif { - (*_mp_free_func) (m->_mp_d, (m->_mp_prec + 1) * BYTES_PER_MP_LIMB); + (*__gmp_free_func) (m->_mp_d, (m->_mp_prec + 1) * BYTES_PER_MP_LIMB); } diff --git a/mpf/dump.c b/mpf/dump.c index a4fadcc7a..9f026ecd3 100644 --- a/mpf/dump.c +++ b/mpf/dump.c @@ -44,5 +44,5 @@ mpf_dump (u) printf ("-0.%se%ld\n", str + 1, exp); else printf ("0.%se%ld\n", str, exp); - (*_mp_free_func) (str, 0);/* ??? broken alloc interface, pass what size ??? */ + (*__gmp_free_func) (str, 0);/* ??? broken alloc interface, pass what size ??? */ } diff --git a/mpf/get_str.c b/mpf/get_str.c index e2a1601a3..e989c326a 100644 --- a/mpf/get_str.c +++ b/mpf/get_str.c @@ -107,7 +107,7 @@ mpf_get_str (digit_ptr, exp, base, n_digits, u) { /* We didn't get a string from the user. Allocate one (and return a pointer to it) with space for `-' and terminating null. */ - digit_ptr = (char *) (*_mp_allocate_func) (n_digits + 2); + digit_ptr = (char *) (*__gmp_allocate_func) (n_digits + 2); } if (usize == 0) diff --git a/mpf/init.c b/mpf/init.c index 7111993e5..d5c12f354 100644 --- a/mpf/init.c +++ b/mpf/init.c @@ -31,7 +31,7 @@ mpf_init (r) #endif { mp_size_t prec = __gmp_default_fp_limb_precision; - r->_mp_d = (mp_ptr) (*_mp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); + r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); r->_mp_prec = prec; r->_mp_size = 0; r->_mp_exp = 0; diff --git a/mpf/init2.c b/mpf/init2.c index a21c61a51..1b2744a27 100644 --- a/mpf/init2.c +++ b/mpf/init2.c @@ -34,7 +34,7 @@ mpf_init2 (r, prec_in_bits) mp_size_t prec; prec = (MAX (53, prec_in_bits) + 2 * BITS_PER_MP_LIMB - 1)/BITS_PER_MP_LIMB; - r->_mp_d = (mp_ptr) (*_mp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); + r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); r->_mp_prec = prec; r->_mp_size = 0; r->_mp_exp = 0; diff --git a/mpf/inp_str.c b/mpf/inp_str.c index 7d9625b21..4e959f58c 100644 --- a/mpf/inp_str.c +++ b/mpf/inp_str.c @@ -45,7 +45,7 @@ mpf_inp_str (rop, stream, base) stream = stdin; alloc_size = 100; - str = (char *) (*_mp_allocate_func) (alloc_size); + str = (char *) (*__gmp_allocate_func) (alloc_size); str_size = 0; nread = 0; @@ -63,7 +63,7 @@ mpf_inp_str (rop, stream, base) { size_t old_alloc_size = alloc_size; alloc_size = alloc_size * 3 / 2; - str = (char *) (*_mp_reallocate_func) (str, old_alloc_size, alloc_size); + str = (char *) (*__gmp_reallocate_func) (str, old_alloc_size, alloc_size); } if (c == EOF || isspace (c)) break; @@ -76,7 +76,7 @@ mpf_inp_str (rop, stream, base) { size_t old_alloc_size = alloc_size; alloc_size = alloc_size * 3 / 2; - str = (char *) (*_mp_reallocate_func) (str, old_alloc_size, alloc_size); + str = (char *) (*__gmp_reallocate_func) (str, old_alloc_size, alloc_size); } str[str_size] = 0; @@ -84,6 +84,6 @@ mpf_inp_str (rop, stream, base) if (retval == -1) return 0; /* error */ - (*_mp_free_func) (str, alloc_size); + (*__gmp_free_func) (str, alloc_size); return str_size + nread; } diff --git a/mpf/iset.c b/mpf/iset.c index f72846d5c..b5f4d37c9 100644 --- a/mpf/iset.c +++ b/mpf/iset.c @@ -36,7 +36,7 @@ mpf_init_set (r, s) mp_size_t prec; prec = __gmp_default_fp_limb_precision; - r->_mp_d = (mp_ptr) (*_mp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); + r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); r->_mp_prec = prec; prec++; /* lie not to lose precision in assignment */ diff --git a/mpf/iset_d.c b/mpf/iset_d.c index 5a4cfecbf..77a26ae95 100644 --- a/mpf/iset_d.c +++ b/mpf/iset_d.c @@ -32,7 +32,7 @@ mpf_init_set_d (r, val) #endif { mp_size_t prec = __gmp_default_fp_limb_precision; - r->_mp_d = (mp_ptr) (*_mp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); + r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); r->_mp_prec = prec; mpf_set_d (r, val); diff --git a/mpf/iset_si.c b/mpf/iset_si.c index 993eef6e5..02c9ce635 100644 --- a/mpf/iset_si.c +++ b/mpf/iset_si.c @@ -32,7 +32,7 @@ mpf_init_set_si (r, val) #endif { mp_size_t prec = __gmp_default_fp_limb_precision; - r->_mp_d = (mp_ptr) (*_mp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); + r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); r->_mp_prec = prec; if (val > 0) diff --git a/mpf/iset_str.c b/mpf/iset_str.c index fba94be30..99301fa0c 100644 --- a/mpf/iset_str.c +++ b/mpf/iset_str.c @@ -33,7 +33,7 @@ mpf_init_set_str (r, s, base) #endif { mp_size_t prec = __gmp_default_fp_limb_precision; - r->_mp_d = (mp_ptr) (*_mp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); + r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); r->_mp_prec = prec; r->_mp_size = 0; r->_mp_exp = 0; diff --git a/mpf/iset_ui.c b/mpf/iset_ui.c index f33c02c80..13f7afb20 100644 --- a/mpf/iset_ui.c +++ b/mpf/iset_ui.c @@ -32,7 +32,7 @@ mpf_init_set_ui (r, val) #endif { mp_size_t prec = __gmp_default_fp_limb_precision; - r->_mp_d = (mp_ptr) (*_mp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); + r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((prec + 1) * BYTES_PER_MP_LIMB); r->_mp_prec = prec; r->_mp_d[0] = val; r->_mp_size = val != 0; diff --git a/mpf/set_prc.c b/mpf/set_prc.c index 70a6aa141..aa67e7cf9 100644 --- a/mpf/set_prc.c +++ b/mpf/set_prc.c @@ -46,7 +46,7 @@ mpf_set_prec (x, prec_in_bits) MPN_COPY_INCR (xp, xp + offset, prec + 1); } - x->_mp_d = (mp_ptr) (*_mp_reallocate_func) + x->_mp_d = (mp_ptr) (*__gmp_reallocate_func) (x->_mp_d, (x->_mp_prec + 1) * BYTES_PER_MP_LIMB, (prec + 1) * BYTES_PER_MP_LIMB); x->_mp_prec = prec; diff --git a/mpf/tests/t-conv.c b/mpf/tests/t-conv.c index 23597de94..960184b4c 100644 --- a/mpf/tests/t-conv.c +++ b/mpf/tests/t-conv.c @@ -84,7 +84,7 @@ main (argc, argv) sprintf (buf, "0.%s@%ld", str, bexp); MPF_SET_STR_OR_ABORT (y, buf, -base); - (*_mp_free_func) (str, 0); + (*__gmp_free_func) (str, 0); mpf_reldiff (rerr, x, y); if (mpf_cmp (rerr, max_rerr) > 0) |