From 5c972901ec4cca2668d9b294077540200f403e69 Mon Sep 17 00:00:00 2001
From: Torbjorn Granlund <tege@gmplib.org>
Date: Sun, 19 Jan 2014 13:25:03 +0100
Subject: Get rid of BYTES_PER_MP_LIMB, most files affected.

---
 mpf/clear.c    | 2 +-
 mpf/clears.c   | 2 +-
 mpf/init.c     | 2 +-
 mpf/init2.c    | 2 +-
 mpf/iset.c     | 2 +-
 mpf/iset_d.c   | 2 +-
 mpf/iset_si.c  | 2 +-
 mpf/iset_str.c | 2 +-
 mpf/iset_ui.c  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'mpf')

diff --git a/mpf/clear.c b/mpf/clear.c
index cfb8482c2..d11b645b2 100644
--- a/mpf/clear.c
+++ b/mpf/clear.c
@@ -24,5 +24,5 @@ along with the GNU MP Library.  If not, see https://www.gnu.org/licenses/.  */
 void
 mpf_clear (mpf_ptr m)
 {
-  (*__gmp_free_func) (m->_mp_d, (size_t) (m->_mp_prec + 1) * BYTES_PER_MP_LIMB);
+  (*__gmp_free_func) (m->_mp_d, (size_t) (m->_mp_prec + 1) * GMP_LIMB_BYTES);
 }
diff --git a/mpf/clears.c b/mpf/clears.c
index 694152370..41d7a7564 100644
--- a/mpf/clears.c
+++ b/mpf/clears.c
@@ -49,7 +49,7 @@ mpf_clears (va_alist)
 
   while (x != NULL)
     {
-      (*__gmp_free_func) (x->_mp_d, (size_t) (x->_mp_prec + 1) * BYTES_PER_MP_LIMB);
+      (*__gmp_free_func) (x->_mp_d, (size_t) (x->_mp_prec + 1) * GMP_LIMB_BYTES);
       x = va_arg (ap, mpf_ptr);
     }
   va_end (ap);
diff --git a/mpf/init.c b/mpf/init.c
index 01a41a2b7..fe0bfc967 100644
--- a/mpf/init.c
+++ b/mpf/init.c
@@ -27,5 +27,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) * BYTES_PER_MP_LIMB);
+  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
 }
diff --git a/mpf/init2.c b/mpf/init2.c
index 92f6a535d..731052540 100644
--- a/mpf/init2.c
+++ b/mpf/init2.c
@@ -29,5 +29,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) * BYTES_PER_MP_LIMB);
+  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
 }
diff --git a/mpf/iset.c b/mpf/iset.c
index 6a06543d6..b78b1e143 100644
--- a/mpf/iset.c
+++ b/mpf/iset.c
@@ -28,7 +28,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) * BYTES_PER_MP_LIMB);
+  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
   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 ed149040e..6124b302d 100644
--- a/mpf/iset_d.c
+++ b/mpf/iset_d.c
@@ -25,7 +25,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) * BYTES_PER_MP_LIMB);
+  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
 
   mpf_set_d (r, val);
 }
diff --git a/mpf/iset_si.c b/mpf/iset_si.c
index ca04cb019..c4e1547da 100644
--- a/mpf/iset_si.c
+++ b/mpf/iset_si.c
@@ -29,7 +29,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) * BYTES_PER_MP_LIMB);
+  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
 
   vl = (mp_limb_t) ABS_CAST (unsigned long int, val);
 
diff --git a/mpf/iset_str.c b/mpf/iset_str.c
index bd8bd60cf..78e406dfe 100644
--- a/mpf/iset_str.c
+++ b/mpf/iset_str.c
@@ -27,7 +27,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) * BYTES_PER_MP_LIMB);
+  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
 
   return mpf_set_str (r, s, base);
 }
diff --git a/mpf/iset_ui.c b/mpf/iset_ui.c
index c35db53c7..82715162a 100644
--- a/mpf/iset_ui.c
+++ b/mpf/iset_ui.c
@@ -27,7 +27,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) * BYTES_PER_MP_LIMB);
+  r->_mp_d = (mp_ptr) (*__gmp_allocate_func) ((size_t) (prec + 1) * GMP_LIMB_BYTES);
   r->_mp_d[0] = val & GMP_NUMB_MASK;
   size = (val != 0);
 
-- 
cgit v1.2.1