Remove TWO

Minor cleanup to remove the macro TWO and use the value directly
instead.

diff --git a/ChangeLog b/ChangeLog
index 64e9c882c84da47afa2ca4f66a99e77a635cf5f2..492b4396d79fdf473c184678958c77594b347c69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-04-03  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+       * sysdeps/ieee754/dbl-64/mpa.h (TWO): Remove definition.
+       * sysdeps/ieee754/dbl-64/mpatan.c (__mpatan): Replace TWO with
+       its value.
+
        [BZ #15305]
        * sysdeps/unix/sysv/linux/kernel-features.h
        [__LINUX_KERNEL_VERSION >= 0x02061d]: Define

diff --git a/sysdeps/ieee754/dbl-64/mpa.h b/sysdeps/ieee754/dbl-64/mpa.h
index 0d8211517fb1ec77f89170c511ec7a48f2f353de..5fad58439417d0255218dd6970c36dedb8e887e7 100644 (file)
--- a/sysdeps/ieee754/dbl-64/mpa.h
+++ b/sysdeps/ieee754/dbl-64/mpa.h
@@ -91,8 +91,6 @@ extern const mp_no mptwo;
 # define  TWO52     0x1.0p52           /* 2^52    */
 #endif
 
-#define  TWO       2.0                 /*  2      */
-
 #define  TWO5      TWOPOW (5)          /* 2^5     */
 #define  TWO8      TWOPOW (8)          /* 2^52    */
 #define  TWO10     TWOPOW (10)         /* 2^10    */

diff --git a/sysdeps/ieee754/dbl-64/mpatan.c b/sysdeps/ieee754/dbl-64/mpatan.c
index 33c6847d9c3891b4c73e5c34578ec9dcef213379..807b16a9bcef03ec92780e7d7fa214b0b52cec85 100644 (file)
--- a/sysdeps/ieee754/dbl-64/mpatan.c
+++ b/sysdeps/ieee754/dbl-64/mpatan.c
@@ -102,7 +102,7 @@ __mpatan (mp_no *x, mp_no *y, int p)
   __dvd (&mpsm, &mptwoim1, &mpt, p);
   for (i = n - 1; i > 1; i--)
     {
-      mptwoim1.d[1] -= TWO;
+      mptwoim1.d[1] -= 2;
       __dvd (&mpsm, &mptwoim1, &mpt1, p);
       __mul (&mpsm, &mpt, &mpt2, p);
       __sub (&mpt1, &mpt2, &mpt, p);