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, 6 insertions, 6 deletions

diff --git a/mul_2si.c b/mul_2si.c
index cdc522425..ad0b29f27 100644
--- a/mul_2si.c
+++ b/mul_2si.c
@@ -33,16 +33,16 @@ mpfr_mul_2si (mpfr_ptr y, mpfr_srcptr x, long int n, mp_rnd_t rnd_mode)
 
   if (MPFR_IS_FP(y) && MPFR_NOTZERO(y))
     {
-      if (n > 0 && (__mpfr_emax < MPFR_EMIN_MIN + n ||
-                    MPFR_EXP(y) > __mpfr_emax - n))
+      if (n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
+                    MPFR_EXP(y) > __gmpfr_emax - n))
         return mpfr_set_overflow (y, rnd_mode, MPFR_SIGN(y));
 
-      if (n < 0 && (__mpfr_emin > MPFR_EMAX_MAX + n ||
-                    MPFR_EXP(y) < __mpfr_emin - n))
+      if (n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n ||
+                    MPFR_EXP(y) < __gmpfr_emin - n))
         {
           if (rnd_mode == GMP_RNDN &&
-              (__mpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
-               MPFR_EXP(y) < __mpfr_emin - (n + 1) ||
+              (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
+               MPFR_EXP(y) < __gmpfr_emin - (n + 1) ||
                mpfr_powerof2_raw (y)))
             rnd_mode = GMP_RNDZ;
           return mpfr_set_underflow (y, rnd_mode, MPFR_SIGN(y));