diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-16 09:24:48 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:25 +0200 |
| commit | c61c6d9880739d65e655d1e8b4b491a4010e49c9 (patch) | |
| tree | a4e427cd1462f79053a444b3719fcaaeffd927f1 /libm/s_round.c | |
| parent | 0769334e2e1c8848757dcf6ca265b6c1dcf98e5d (diff) | |
libm: change j0 to _j0 and y1 to _y1 to avoid shadow warning
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libm/s_round.c')
| -rw-r--r-- | libm/s_round.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libm/s_round.c b/libm/s_round.c index b3e226308..30a2715c8 100644 --- a/libm/s_round.c +++ b/libm/s_round.c @@ -26,41 +26,41 @@ static const double huge = 1.0e300; double round (double x) { - int32_t i0, j0; + int32_t i0, _j0; u_int32_t i1; EXTRACT_WORDS (i0, i1, x); - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) + _j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; + if (_j0 < 20) { - if (j0 < 0) + if (_j0 < 0) { if (huge + x > 0.0) { i0 &= 0x80000000; - if (j0 == -1) + if (_j0 == -1) i0 |= 0x3ff00000; i1 = 0; } } else { - u_int32_t i = 0x000fffff >> j0; + u_int32_t i = 0x000fffff >> _j0; if (((i0 & i) | i1) == 0) /* X is integral. */ return x; if (huge + x > 0.0) { /* Raise inexact if x != 0. */ - i0 += 0x00080000 >> j0; + i0 += 0x00080000 >> _j0; i0 &= ~i; i1 = 0; } } } - else if (j0 > 51) + else if (_j0 > 51) { - if (j0 == 0x400) + if (_j0 == 0x400) /* Inf or NaN. */ return x + x; else @@ -68,7 +68,7 @@ round (double x) } else { - u_int32_t i = 0xffffffff >> (j0 - 20); + u_int32_t i = 0xffffffff >> (_j0 - 20); if ((i1 & i) == 0) /* X is integral. */ return x; @@ -76,7 +76,7 @@ round (double x) if (huge + x > 0.0) { /* Raise inexact if x != 0. */ - u_int32_t j = i1 + (1 << (51 - j0)); + u_int32_t j = i1 + (1 << (51 - _j0)); if (j < i1) i0 += 1; i1 = j; |