Suppress some #define and fix symbol names (makes code cleaner):

perl -pi -e 's/__mpfr_flags/__gmpfr_flags/g' **/*.{c,h}
perl -pi -e 's/__mpfr_emin/__gmpfr_emin/g' **/*.{c,h}
perl -pi -e 's/__mpfr_emax/__gmpfr_emax/g' **/*.{c,h}
perl -pi -e 's/__mpfr_default_fp_bit_precision/__gmpfr_default_fp_bit_precision/g' **/*.{c,h}
perl -pi -e 's/__gmp_default_rounding_mode/__gmpfr_default_rounding_mode/g' **/*.{c,h}
perl -pi -e 's/__mpfr_const_log2_prec/__gmpfr_const_log2_prec/g' **/*.{c,h}
perl -pi -e 's/__mpfr_const_pi_prec/__gmpfr_const_pi_prec/g' **/*.{c,h}
perl -pi -e 's/_mpfr_ceil_log2/__gmpfr_ceil_log2/g' **/*.{c,h}
perl -pi -e 's/_mpfr_floor_log2/__gmpfr_floor_log2/g' **/*.{c,h}
perl -pi -e 's/_mpfr_ceil_exp2/__gmpfr_ceil_exp2/g' **/*.{c,h}
perl -pi -e 's/_mpfr_isqrt/__gmpfr_isqrt/g' **/*.{c,h}
perl -pi -e 's/_mpfr_cuberoot/__gmpfr_cuberoot/g' **/*.{c,h}
perl -pi -e 's/^#define __gmpfr_.*\n//' *.h


git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@2125 280ebfd0-de03-0410-8827-d642c229c3f4

1 files changed, 5 insertions, 5 deletions

diff --git a/exp2.c b/exp2.c
index 48cc8b95c..6f93c8eec 100644
--- a/exp2.c
+++ b/exp2.c
@@ -62,9 +62,9 @@ mpfr_exp2 (mpfr_ptr y, mpfr_srcptr x, mp_rnd_t rnd_mode)
     if (MPFR_IS_ZERO(x))
       return mpfr_set_ui (y, 1, rnd_mode);
 
-    /* since the smallest representable non-zero float is 1/2*2^__mpfr_emin,
-       if x < __mpfr_emin - 1, the result is either 1/2*2^__mpfr_emin or 0 */
-    if (mpfr_cmp_si_2exp (x, __mpfr_emin - 1, 0) < 0)
+    /* since the smallest representable non-zero float is 1/2*2^__gmpfr_emin,
+       if x < __gmpfr_emin - 1, the result is either 1/2*2^__gmpfr_emin or 0 */
+    if (mpfr_cmp_si_2exp (x, __gmpfr_emin - 1, 0) < 0)
       return mpfr_set_underflow (y, rnd_mode, 1);
 
     /* General case */
@@ -82,7 +82,7 @@ mpfr_exp2 (mpfr_ptr y, mpfr_srcptr x, mp_rnd_t rnd_mode)
       /* compute the precision of intermediary variable */
       Nt = MAX(Nx, Ny);
       /* the optimal number of bits : see algorithms.ps */
-      Nt = Nt + 5 + _mpfr_ceil_log2 (Nt);
+      Nt = Nt + 5 + __gmpfr_ceil_log2 (Nt);
 
 
       /* initialise of intermediary	variable */
@@ -105,7 +105,7 @@ mpfr_exp2 (mpfr_ptr y, mpfr_srcptr x, mp_rnd_t rnd_mode)
 	err = Nt - (MPFR_EXP(te) + 2);
 
 	/* actualisation of the precision */
-	Nt += _mpfr_isqrt (Nt) + 10;
+	Nt += __gmpfr_isqrt (Nt) + 10;
 
       } while ((err < 0) || !mpfr_can_round (t, err, GMP_RNDN, rnd_mode, Ny));