Remove definition of GMP_RND_MAX in tests, since the corresponding mpfr symbol got private in MPFR-3.0.

git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@760 211d60ee-9f03-0410-a15a-8952a2c7a4e4

2 files changed, 10 insertions, 17 deletions

diff --git a/tests/mpc-tests.h b/tests/mpc-tests.h
index 5c89db5..dd9a275 100644
--- a/tests/mpc-tests.h
+++ b/tests/mpc-tests.h
@@ -160,13 +160,6 @@ typedef struct
 void tgeneric (mpc_function, mpfr_prec_t, mpfr_prec_t, mpfr_prec_t, mp_exp_t);
 
 
-/* GMP_RND_MAX is used is tgeneric.c.
-   It was renamed MPFR_RND_MAX in mpfr-3.0 */
-#if MPFR_VERSION_MAJOR > 2
-#  define GMP_RND_MAX MPFR_RND_MAX
-#endif
-
-
 /** READ FILE WITH TEST DATA SET **/
 /* data_check (function, "data_file_name") checks function results against
    precomputed data in a file.*/
diff --git a/tests/tgeneric.c b/tests/tgeneric.c
index e087aaa..2ff8a6e 100644
--- a/tests/tgeneric.c
+++ b/tests/tgeneric.c
@@ -913,11 +913,11 @@ tgeneric (mpc_function function, mpfr_prec_t prec_min,
             }
         }
 
-      for (rnd_re = GMP_RNDN; rnd_re < GMP_RND_MAX; ++rnd_re)
+      for (rnd_re = GMP_RNDN; mpfr_print_rnd_mode (rnd_re); ++rnd_re)
         switch (function.type)
           {
           case CCC:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_ccc (&function, z1, z2, z3, zzzz, z4,
                             RNDC (rnd_re, rnd_im));
             reuse_ccc (&function, z1, z2, z3, z4);
@@ -927,49 +927,49 @@ tgeneric (mpc_function function, mpfr_prec_t prec_min,
             reuse_fc (&function, z1, z2, x1);
             break;
           case CC:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_cc (&function, z1, z2, zzzz, z3,
                            RNDC (rnd_re, rnd_im));
             reuse_cc (&function, z1, z2, z3);
             break;
           case CFC:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_cfc (&function, x1, z1, z2, zzzz, z3,
                             RNDC (rnd_re, rnd_im));
             reuse_cfc (&function, z1, x1, z2, z3);
             break;
           case CCF:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_ccf (&function, z1, x1, z2, zzzz, z3,
                             RNDC (rnd_re, rnd_im));
             reuse_ccf (&function, z1, x1, z2, z3);
             break;
           case CCU:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_ccu (&function, z1, ul1, z2, zzzz, z3,
                             RNDC (rnd_re, rnd_im));
             reuse_ccu (&function, z1, ul1, z2, z3);
             break;
           case CUC:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_cuc (&function, ul1, z1, z2, zzzz, z3,
                             RNDC (rnd_re, rnd_im));
             reuse_cuc (&function, ul1, z1, z2, z3);
             break;
           case CCS:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_ccs (&function, z1, lo, z2, zzzz, z3,
                             RNDC (rnd_re, rnd_im));
             reuse_ccs (&function, z1, lo, z2, z3);
             break;
           case CCI:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_cci (&function, z1, i, z2, zzzz, z3,
                             RNDC (rnd_re, rnd_im));
             reuse_cci (&function, z1, i, z2, z3);
             break;
           case CUUC:
-            for (rnd_im = GMP_RNDN; rnd_im < GMP_RND_MAX; ++rnd_im)
+            for (rnd_im = GMP_RNDN; mpfr_print_rnd_mode (rnd_im); ++rnd_im)
               tgeneric_cuuc (&function, ul1, ul2, z1, z2, zzzz, z3,
                              RNDC (rnd_re, rnd_im));
             reuse_cuuc (&function, ul1, ul2, z1, z2, z3);