Wrap remaining limb allocations in __GMP_ALLOCATE_FUNC_LIMBS.

7 files changed, 7 insertions, 7 deletions

diff --git a/mpf/init.c b/mpf/init.c
index d8590f27a..0e428d3d4 100644
--- a/mpf/init.c
+++ b/mpf/init.c
@@ -38,5 +38,5 @@ mpf_init (mpf_ptr r)
   r->_mp_size = 0;
   r->_mp_exp = 0;
   r->_mp_prec = prec;
-  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
+  r->_mp_d = __GMP_ALLOCATE_FUNC_LIMBS (prec + 1);
 }
diff --git a/mpf/init2.c b/mpf/init2.c
index a7891e33d..72c872608 100644
--- a/mpf/init2.c
+++ b/mpf/init2.c
@@ -40,5 +40,5 @@ mpf_init2 (mpf_ptr r, mp_bitcnt_t prec_in_bits)
   r->_mp_size = 0;
   r->_mp_exp = 0;
   r->_mp_prec = prec;
-  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
+  r->_mp_d = __GMP_ALLOCATE_FUNC_LIMBS (prec + 1);
 }
diff --git a/mpf/iset.c b/mpf/iset.c
index c8c35e50e..246f36748 100644
--- a/mpf/iset.c
+++ b/mpf/iset.c
@@ -39,7 +39,7 @@ mpf_init_set (mpf_ptr r, mpf_srcptr s)
   mp_size_t prec;
 
   prec = __gmp_default_fp_limb_precision;
-  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
+  r->_mp_d = __GMP_ALLOCATE_FUNC_LIMBS (prec + 1);
   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 d128db9b4..e3492e361 100644
--- a/mpf/iset_d.c
+++ b/mpf/iset_d.c
@@ -36,7 +36,7 @@ mpf_init_set_d (mpf_ptr r, double val)
 {
   mp_size_t prec = __gmp_default_fp_limb_precision;
   r->_mp_prec = prec;
-  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
+  r->_mp_d = __GMP_ALLOCATE_FUNC_LIMBS (prec + 1);
 
   mpf_set_d (r, val);
 }
diff --git a/mpf/iset_si.c b/mpf/iset_si.c
index f7e900508..179f80c91 100644
--- a/mpf/iset_si.c
+++ b/mpf/iset_si.c
@@ -40,7 +40,7 @@ mpf_init_set_si (mpf_ptr r, long int val)
   mp_limb_t vl;
 
   r->_mp_prec = prec;
-  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
+  r->_mp_d = __GMP_ALLOCATE_FUNC_LIMBS (prec + 1);
 
   vl = (mp_limb_t) ABS_CAST (unsigned long int, val);
 
diff --git a/mpf/iset_str.c b/mpf/iset_str.c
index a181f80c9..5cb429176 100644
--- a/mpf/iset_str.c
+++ b/mpf/iset_str.c
@@ -38,7 +38,7 @@ mpf_init_set_str (mpf_ptr r, const char *s, int base)
   r->_mp_size = 0;
   r->_mp_exp = 0;
   r->_mp_prec = prec;
-  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
+  r->_mp_d = __GMP_ALLOCATE_FUNC_LIMBS (prec + 1);
 
   return mpf_set_str (r, s, base);
 }
diff --git a/mpf/iset_ui.c b/mpf/iset_ui.c
index f04798211..3f48cbd68 100644
--- a/mpf/iset_ui.c
+++ b/mpf/iset_ui.c
@@ -38,7 +38,7 @@ mpf_init_set_ui (mpf_ptr r, unsigned long int val)
   mp_size_t size;
 
   r->_mp_prec = prec;
-  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
+  r->_mp_d = __GMP_ALLOCATE_FUNC_LIMBS (prec + 1);
   r->_mp_d[0] = val & GMP_NUMB_MASK;
   size = (val != 0);