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_modf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libm/s_modf.c') diff --git a/libm/s_modf.c b/libm/s_modf.c index f73d5fddb..0a2026cea 100644 --- a/libm/s_modf.c +++ b/libm/s_modf.c @@ -26,16 +26,16 @@ static const double one = 1.0; double modf(double x, double *iptr) { - int32_t i0,i1,j0; + int32_t i0,i1,_j0; u_int32_t i; EXTRACT_WORDS(i0,i1,x); - j0 = ((i0>>20)&0x7ff)-0x3ff; /* exponent of x */ - if(j0<20) { /* integer part in high x */ - if(j0<0) { /* |x|<1 */ + _j0 = ((i0>>20)&0x7ff)-0x3ff; /* exponent of x */ + if(_j0<20) { /* integer part in high x */ + if(_j0<0) { /* |x|<1 */ INSERT_WORDS(*iptr,i0&0x80000000,0); /* *iptr = +-0 */ return x; } else { - i = (0x000fffff)>>j0; + i = (0x000fffff)>>_j0; if(((i0&i)|i1)==0) { /* x is integral */ *iptr = x; INSERT_WORDS(x,i0&0x80000000,0); /* return +-0 */ @@ -45,15 +45,15 @@ double modf(double x, double *iptr) return x - *iptr; } } - } else if (j0>51) { /* no fraction part */ + } else if (_j0>51) { /* no fraction part */ *iptr = x*one; /* We must handle NaNs separately. */ - if (j0 == 0x400 && ((i0 & 0xfffff) | i1)) + if (_j0 == 0x400 && ((i0 & 0xfffff) | i1)) return x*one; INSERT_WORDS(x,i0&0x80000000,0); /* return +-0 */ return x; } else { /* fraction part in low x */ - i = ((u_int32_t)(0xffffffff))>>(j0-20); + i = ((u_int32_t)(0xffffffff))>>(_j0-20); if((i1&i)==0) { /* x is integral */ *iptr = x; INSERT_WORDS(x,i0&0x80000000,0); /* return +-0 */ -- cgit v1.2.3