Clean-up and various changes to be able to build MPFR with g++.

But the following 3 tests currently fail with g++ 4.3.1:
  FAIL: tprintf
  FAIL: tsprintf
  FAIL: tfprintf
This is an "Illegal instruction" error, so probably a bug in g++.
[Edit: acinclude.m4 now uses gl_SIZE_MAX, typically from size_max.m4,
but which is not installed on all machines; this will be added to the
MPFR repository in changesets 5680 and 5683.]

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

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/tcot.c b/tests/tcot.c
index 7720cbdc5..8ac37e4a2 100644
--- a/tests/tcot.c
+++ b/tests/tcot.c
@@ -102,18 +102,18 @@ two2emin (mp_exp_t e)
     RND_LOOP (rnd)
       {
         mpfr_set_si (y, i, GMP_RNDN);
-        mpfr_ui_div (y, 1, y, rnd);  /* no overflow/underflow */
+        mpfr_ui_div (y, 1, y, (mp_rnd_t) rnd);  /* no overflow/underflow */
         mpfr_set_si_2exp (x, i, -e, GMP_RNDN);
         if (ABS (i) != 3)  /* not a power of 2 (not 0 either) */
-          mpfr_sub (y, y, x, rnd);  /* no overflow/underflow */
+          mpfr_sub (y, y, x, (mp_rnd_t) rnd);  /* no overflow/underflow */
         mpfr_set_ui_2exp (x, 1, -e, GMP_RNDN);
-        mpfr_div (y, y, x, rnd);  /* 1/x - SIGN(x).epsilon */
+        mpfr_div (y, y, x, (mp_rnd_t) rnd);  /* 1/x - SIGN(x).epsilon */
         mpfr_set_si_2exp (x, i, -e, GMP_RNDN);
-        mpfr_cot (x, x, rnd);
+        mpfr_cot (x, x, (mp_rnd_t) rnd);
         if (! mpfr_equal_p (x, y))
           {
             printf ("Error in two2emin for i = %d and rnd = %s\n",
-                    i, mpfr_print_rnd_mode (rnd));
+                    i, mpfr_print_rnd_mode ((mp_rnd_t) rnd));
             printf ("Got        ");
             mpfr_dump (x);
             printf ("instead of ");