From c61c6d9880739d65e655d1e8b4b491a4010e49c9 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 16 Mar 2011 09:24:48 +0100 Subject: libm: change j0 to _j0 and y1 to _y1 to avoid shadow warning Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libm/s_trunc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libm/s_trunc.c') diff --git a/libm/s_trunc.c b/libm/s_trunc.c index eb4f6a8f8..987ada95d 100644 --- a/libm/s_trunc.c +++ b/libm/s_trunc.c @@ -24,30 +24,30 @@ double trunc (double x) { - int32_t i0, j0; + int32_t i0, _j0; u_int32_t i1; int sx; EXTRACT_WORDS (i0, i1, x); sx = i0 & 0x80000000; - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) + _j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; + if (_j0 < 20) { - if (j0 < 0) + if (_j0 < 0) /* The magnitude of the number is < 1 so the result is +-0. */ INSERT_WORDS (x, sx, 0); else - INSERT_WORDS (x, sx | (i0 & ~(0x000fffff >> j0)), 0); + INSERT_WORDS (x, sx | (i0 & ~(0x000fffff >> _j0)), 0); } - else if (j0 > 51) + else if (_j0 > 51) { - if (j0 == 0x400) + if (_j0 == 0x400) /* x is inf or NaN. */ return x + x; } else { - INSERT_WORDS (x, i0, i1 & ~(0xffffffffu >> (j0 - 20))); + INSERT_WORDS (x, i0, i1 & ~(0xffffffffu >> (_j0 - 20))); } return x; -- cgit v1.2.3