* * (__gmp_allocate_func etc): Rename from _mp_allocate_func etc.

        (__gmp_default_allocate etc): Rename from _mp_default_allocate etc.

18 files changed, 31 insertions, 31 deletions

diff --git a/mpz/array_init.c b/mpz/array_init.c
index 3d96418de..f7db7b97b 100644
--- a/mpz/array_init.c
+++ b/mpz/array_init.c
@@ -37,7 +37,7 @@ mpz_array_init (arr, arr_size, nbits)
   mp_size_t nlimbs;
 
   nlimbs = (nbits + BITS_PER_MP_LIMB - 1) / BITS_PER_MP_LIMB;
-  p = (mp_ptr) (*_mp_allocate_func) (arr_size * nlimbs * BYTES_PER_MP_LIMB);
+  p = (mp_ptr) (*__gmp_allocate_func) (arr_size * nlimbs * BYTES_PER_MP_LIMB);
 
   for (i = 0; i < arr_size; i++)
     {
diff --git a/mpz/clear.c b/mpz/clear.c
index ad649021e..ade6c54a0 100644
--- a/mpz/clear.c
+++ b/mpz/clear.c
@@ -31,5 +31,5 @@ mpz_clear (m)
      mpz_ptr m;
 #endif
 {
-  (*_mp_free_func) (m->_mp_d, m->_mp_alloc * BYTES_PER_MP_LIMB);
+  (*__gmp_free_func) (m->_mp_d, m->_mp_alloc * BYTES_PER_MP_LIMB);
 }
diff --git a/mpz/dump.c b/mpz/dump.c
index 3fccb9d04..096483a34 100644
--- a/mpz/dump.c
+++ b/mpz/dump.c
@@ -40,5 +40,5 @@ mpz_dump (u)
 
   str = mpz_get_str (0, 10, u);
   printf ("%s\n", str);
-  (*_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/mpz/get_str.c b/mpz/get_str.c
index 9c46e594b..d8e42b29e 100644
--- a/mpz/get_str.c
+++ b/mpz/get_str.c
@@ -67,7 +67,7 @@ mpz_get_str (res_str, base, x)
     {
       /* We didn't get a string from the user.  Allocate one (and return
 	 a pointer to it).  */
-      res_str = (char *) (*_mp_allocate_func) (str_size);
+      res_str = (char *) (*__gmp_allocate_func) (str_size);
       /* Make str, the variable used for raw result from mpn_get_str,
 	 point to the same string, but just after a possible minus sign.  */
       str = (unsigned char *) res_str + 1;
diff --git a/mpz/init.c b/mpz/init.c
index 5735cb22a..13596de84 100644
--- a/mpz/init.c
+++ b/mpz/init.c
@@ -31,6 +31,6 @@ mpz_init (x)
 #endif
 {
   x->_mp_alloc = 1;
-  x->_mp_d = (mp_ptr) (*_mp_allocate_func) (BYTES_PER_MP_LIMB);
+  x->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
   x->_mp_size = 0;
 }
diff --git a/mpz/inp_str.c b/mpz/inp_str.c
index 7a6e36365..c7eb234e3 100644
--- a/mpz/inp_str.c
+++ b/mpz/inp_str.c
@@ -124,7 +124,7 @@ mpz_inp_str (x, stream, base)
     }
 
   alloc_size = 100;
-  str = (char *) (*_mp_allocate_func) (alloc_size);
+  str = (char *) (*__gmp_allocate_func) (alloc_size);
   str_size = 0;
 
   for (;;)
@@ -134,7 +134,7 @@ mpz_inp_str (x, 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);
 	}
       dig = digit_value_in_base (c, base);
       if (dig < 0)
@@ -149,7 +149,7 @@ mpz_inp_str (x, stream, base)
   if (str_size == 0)
     {
       x->_mp_size = 0;
-      (*_mp_free_func) (str, alloc_size);
+      (*__gmp_free_func) (str, alloc_size);
       return nread;
     }
 
@@ -162,6 +162,6 @@ mpz_inp_str (x, stream, base)
   xsize = mpn_set_str (x->_mp_d, (unsigned char *) str, str_size, base);
   x->_mp_size = negative ? -xsize : xsize;
 
-  (*_mp_free_func) (str, alloc_size);
+  (*__gmp_free_func) (str, alloc_size);
   return str_size + nread;
 }
diff --git a/mpz/iset.c b/mpz/iset.c
index 662d8b996..b473175f5 100644
--- a/mpz/iset.c
+++ b/mpz/iset.c
@@ -39,7 +39,7 @@ mpz_init_set (w, u)
   size = ABS (usize);
 
   w->_mp_alloc = MAX (size, 1);
-  w->_mp_d = (mp_ptr) (*_mp_allocate_func) (w->_mp_alloc * BYTES_PER_MP_LIMB);
+  w->_mp_d = (mp_ptr) (*__gmp_allocate_func) (w->_mp_alloc * BYTES_PER_MP_LIMB);
 
   wp = w->_mp_d;
   up = u->_mp_d;
diff --git a/mpz/iset_d.c b/mpz/iset_d.c
index 2f4545015..446d13f66 100644
--- a/mpz/iset_d.c
+++ b/mpz/iset_d.c
@@ -33,7 +33,7 @@ mpz_init_set_d (dest, val)
 #endif
 {
   dest->_mp_alloc = 1;
-  dest->_mp_d = (mp_ptr) (*_mp_allocate_func) (BYTES_PER_MP_LIMB);
+  dest->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
   dest->_mp_size = 0;
   mpz_set_d (dest, val);
 }
diff --git a/mpz/iset_si.c b/mpz/iset_si.c
index 96110b890..8d503e84e 100644
--- a/mpz/iset_si.c
+++ b/mpz/iset_si.c
@@ -33,7 +33,7 @@ mpz_init_set_si (x, val)
 #endif
 {
   x->_mp_alloc = 1;
-  x->_mp_d = (mp_ptr) (*_mp_allocate_func) (BYTES_PER_MP_LIMB);
+  x->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
   if (val > 0)
     {
       x->_mp_d[0] = val;
diff --git a/mpz/iset_str.c b/mpz/iset_str.c
index c90c5886d..399265a67 100644
--- a/mpz/iset_str.c
+++ b/mpz/iset_str.c
@@ -38,7 +38,7 @@ mpz_init_set_str (x, str, base)
 #endif
 {
   x->_mp_alloc = 1;
-  x->_mp_d = (mp_ptr) (*_mp_allocate_func) (BYTES_PER_MP_LIMB);
+  x->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
 
   /* if str has no digits mpz_set_str leaves x->_mp_size unset */
   x->_mp_size = 0;
diff --git a/mpz/iset_ui.c b/mpz/iset_ui.c
index b85748b81..062bab043 100644
--- a/mpz/iset_ui.c
+++ b/mpz/iset_ui.c
@@ -33,7 +33,7 @@ mpz_init_set_ui (x, val)
 #endif
 {
   x->_mp_alloc = 1;
-  x->_mp_d = (mp_ptr) (*_mp_allocate_func) (BYTES_PER_MP_LIMB);
+  x->_mp_d = (mp_ptr) (*__gmp_allocate_func) (BYTES_PER_MP_LIMB);
   x->_mp_d[0] = val;
   x->_mp_size = val != 0;
 }
diff --git a/mpz/mul.c b/mpz/mul.c
index d5b4793aa..7d2574f91 100644
--- a/mpz/mul.c
+++ b/mpz/mul.c
@@ -85,10 +85,10 @@ mult (u, v, w)
 	  free_me_size = w->_mp_alloc;
 	}
       else
-	(*_mp_free_func) (wp, w->_mp_alloc * BYTES_PER_MP_LIMB);
+	(*__gmp_free_func) (wp, w->_mp_alloc * BYTES_PER_MP_LIMB);
 
       w->_mp_alloc = wsize;
-      wp = (mp_ptr) (*_mp_allocate_func) (wsize * BYTES_PER_MP_LIMB);
+      wp = (mp_ptr) (*__gmp_allocate_func) (wsize * BYTES_PER_MP_LIMB);
       w->_mp_d = wp;
     }
   else
@@ -126,6 +126,6 @@ mult (u, v, w)
 
   w->_mp_size = sign_product < 0 ? -wsize : wsize;
   if (free_me != NULL)
-    (*_mp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
+    (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
   TMP_FREE (marker);
 }
diff --git a/mpz/powm_ui.c b/mpz/powm_ui.c
index 73373ed32..f4e8a2dc8 100644
--- a/mpz/powm_ui.c
+++ b/mpz/powm_ui.c
@@ -115,9 +115,9 @@ mpz_powm_ui (res, base, exp, mod)
 	  free_me_size = res->_mp_alloc;
 	}
       else
-	(*_mp_free_func) (rp, res->_mp_alloc * BYTES_PER_MP_LIMB);
+	(*__gmp_free_func) (rp, res->_mp_alloc * BYTES_PER_MP_LIMB);
 
-      rp = (mp_ptr) (*_mp_allocate_func) (size * BYTES_PER_MP_LIMB);
+      rp = (mp_ptr) (*__gmp_allocate_func) (size * BYTES_PER_MP_LIMB);
       res->_mp_alloc = size;
       res->_mp_d = rp;
     }
@@ -243,6 +243,6 @@ mpz_powm_ui (res, base, exp, mod)
   res->_mp_size = rsize;
 
   if (free_me != NULL)
-    (*_mp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
+    (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
   TMP_FREE (marker);
 }
diff --git a/mpz/realloc.c b/mpz/realloc.c
index 0004fe00f..6382f6112 100644
--- a/mpz/realloc.c
+++ b/mpz/realloc.c
@@ -35,7 +35,7 @@ _mpz_realloc (m, new_size)
   if (new_size == 0)
     new_size = 1;
 
-  m->_mp_d = (mp_ptr) (*_mp_reallocate_func) (m->_mp_d,
+  m->_mp_d = (mp_ptr) (*__gmp_reallocate_func) (m->_mp_d,
 					      m->_mp_alloc * BYTES_PER_MP_LIMB,
 					      new_size * BYTES_PER_MP_LIMB);
   m->_mp_alloc = new_size;
diff --git a/mpz/sqrt.c b/mpz/sqrt.c
index 71a37da54..f86cece13 100644
--- a/mpz/sqrt.c
+++ b/mpz/sqrt.c
@@ -57,10 +57,10 @@ mpz_sqrt (root, op)
 	  free_me_size = root->_mp_alloc;
 	}
       else
-	(*_mp_free_func) (root_ptr, root->_mp_alloc * BYTES_PER_MP_LIMB);
+	(*__gmp_free_func) (root_ptr, root->_mp_alloc * BYTES_PER_MP_LIMB);
 
       root->_mp_alloc = root_size;
-      root_ptr = (mp_ptr) (*_mp_allocate_func) (root_size * BYTES_PER_MP_LIMB);
+      root_ptr = (mp_ptr) (*__gmp_allocate_func) (root_size * BYTES_PER_MP_LIMB);
       root->_mp_d = root_ptr;
     }
   else
@@ -81,6 +81,6 @@ mpz_sqrt (root, op)
   root->_mp_size = root_size;
 
   if (free_me != NULL)
-    (*_mp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
+    (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
   TMP_FREE (marker);
 }
diff --git a/mpz/sqrtrem.c b/mpz/sqrtrem.c
index c9688cc63..48a894445 100644
--- a/mpz/sqrtrem.c
+++ b/mpz/sqrtrem.c
@@ -77,10 +77,10 @@ msqrt (op, root, rem)
 	  free_me_size = root->_mp_alloc;
 	}
       else
-	(*_mp_free_func) (root_ptr, root->_mp_alloc * BYTES_PER_MP_LIMB);
+	(*__gmp_free_func) (root_ptr, root->_mp_alloc * BYTES_PER_MP_LIMB);
 
       root->_mp_alloc = root_size;
-      root_ptr = (mp_ptr) (*_mp_allocate_func) (root_size * BYTES_PER_MP_LIMB);
+      root_ptr = (mp_ptr) (*__gmp_allocate_func) (root_size * BYTES_PER_MP_LIMB);
       root->_mp_d = root_ptr;
     }
   else
@@ -106,6 +106,6 @@ msqrt (op, root, rem)
   rem->_mp_size = rem_size;
 
   if (free_me != NULL)
-    (*_mp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
+    (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
   TMP_FREE (marker);
 }
diff --git a/mpz/tests/convert.c b/mpz/tests/convert.c
index 47b855b5d..3a83c4e02 100644
--- a/mpz/tests/convert.c
+++ b/mpz/tests/convert.c
@@ -58,7 +58,7 @@ main (argc, argv)
 
       str = mpz_get_str ((char *) 0, base, op1);
       MPZ_SET_STR_OR_ABORT (op2, str, base);
-      (*_mp_free_func) (str, 0);
+      (*__gmp_free_func) (str, 0);
 
       if (mpz_cmp (op1, op2))
 	{
diff --git a/mpz/tests/t-mul.c b/mpz/tests/t-mul.c
index 104606cfd..fae574aec 100644
--- a/mpz/tests/t-mul.c
+++ b/mpz/tests/t-mul.c
@@ -134,10 +134,10 @@ mpz_refmul (w, u, v)
 	  free_me_size = w->_mp_alloc;
 	}
       else
-	(*_mp_free_func) (wp, w->_mp_alloc * BYTES_PER_MP_LIMB);
+	(*__gmp_free_func) (wp, w->_mp_alloc * BYTES_PER_MP_LIMB);
 
       w->_mp_alloc = wsize;
-      wp = (mp_ptr) (*_mp_allocate_func) (wsize * BYTES_PER_MP_LIMB);
+      wp = (mp_ptr) (*__gmp_allocate_func) (wsize * BYTES_PER_MP_LIMB);
       w->_mp_d = wp;
     }
   else
@@ -165,7 +165,7 @@ mpz_refmul (w, u, v)
   wsize = _mpn_mul_classic (wp, up, usize, vp, vsize);
   w->_mp_size = sign_product < 0 ? -wsize : wsize;
   if (free_me != NULL)
-    (*_mp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
+    (*__gmp_free_func) (free_me, free_me_size * BYTES_PER_MP_LIMB);
 
   TMP_FREE (marker);
 }