merge trunk into branch rootsunityrootsunity

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

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/tnorm.c b/tests/tnorm.c
index 3f4dccd..1dba939 100644
--- a/tests/tnorm.c
+++ b/tests/tnorm.c
@@ -1,6 +1,6 @@
 /* tnorm -- test file for mpc_norm.
 
-Copyright (C) 2008, 2011 INRIA
+Copyright (C) 2008, 2011, 2012 INRIA
 
 This file is part of GNU MPC.
 
@@ -30,11 +30,11 @@ test_underflow (void)
   
   mpfr_set_emin (-1); /* smallest positive number is 0.5*2^emin = 0.25 */
   mpc_init2 (z, 10);
-  mpfr_set_ui_2exp (mpc_realref (z), 1023, -11, GMP_RNDN); /* exact */
-  mpfr_set_ui_2exp (mpc_imagref (z), 1023, -11, GMP_RNDN); /* exact */
+  mpfr_set_ui_2exp (mpc_realref (z), 1023, -11, MPFR_RNDN); /* exact */
+  mpfr_set_ui_2exp (mpc_imagref (z), 1023, -11, MPFR_RNDN); /* exact */
   mpfr_init2 (f, 10);
 
-  inex = mpc_norm (f, z, GMP_RNDZ); /* should give 511/1024 */
+  inex = mpc_norm (f, z, MPFR_RNDZ); /* should give 511/1024 */
   if (inex >= 0)
     {
       printf ("Error in underflow case (1)\n");
@@ -47,12 +47,12 @@ test_underflow (void)
       printf ("got      ");
       mpfr_dump (f);
       printf ("expected ");
-      mpfr_set_ui_2exp (f, 511, -10, GMP_RNDZ);
+      mpfr_set_ui_2exp (f, 511, -10, MPFR_RNDZ);
       mpfr_dump (f);
       exit (1);
     }
 
-  inex = mpc_norm (f, z, GMP_RNDN); /* should give 511/1024 */
+  inex = mpc_norm (f, z, MPFR_RNDN); /* should give 511/1024 */
   if (inex >= 0)
     {
       printf ("Error in underflow case (2)\n");
@@ -65,12 +65,12 @@ test_underflow (void)
       printf ("got      ");
       mpfr_dump (f);
       printf ("expected ");
-      mpfr_set_ui_2exp (f, 511, -10, GMP_RNDZ);
+      mpfr_set_ui_2exp (f, 511, -10, MPFR_RNDZ);
       mpfr_dump (f);
       exit (1);
     }
 
-  inex = mpc_norm (f, z, GMP_RNDU); /* should give 1023/2048 */
+  inex = mpc_norm (f, z, MPFR_RNDU); /* should give 1023/2048 */
   if (inex <= 0)
     {
       printf ("Error in underflow case (3)\n");
@@ -83,7 +83,7 @@ test_underflow (void)
       printf ("got      ");
       mpfr_dump (f);
       printf ("expected ");
-      mpfr_set_ui_2exp (f, 1023, -11, GMP_RNDZ);
+      mpfr_set_ui_2exp (f, 1023, -11, MPFR_RNDZ);
       mpfr_dump (f);
       exit (1);
     }