summaryrefslogtreecommitdiff
path: root/libm/s_floor.c
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-16 09:24:48 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:25 +0200
commitc61c6d9880739d65e655d1e8b4b491a4010e49c9 (patch)
treea4e427cd1462f79053a444b3719fcaaeffd927f1 /libm/s_floor.c
parent0769334e2e1c8848757dcf6ca265b6c1dcf98e5d (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_floor.c')
-rw-r--r--libm/s_floor.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/libm/s_floor.c b/libm/s_floor.c
index 91f1879be..21d9821e4 100644
--- a/libm/s_floor.c
+++ b/libm/s_floor.c
@@ -28,36 +28,36 @@ static const double huge = 1.0e300;
double floor(double x)
{
- int32_t i0,i1,j0;
+ int32_t i0,i1,_j0;
u_int32_t i,j;
EXTRACT_WORDS(i0,i1,x);
- j0 = ((i0>>20)&0x7ff)-0x3ff;
- if(j0<20) {
- if(j0<0) { /* raise inexact if x != 0 */
+ _j0 = ((i0>>20)&0x7ff)-0x3ff;
+ if(_j0<20) {
+ if(_j0<0) { /* raise inexact if x != 0 */
if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */
if(i0>=0) {i0=i1=0;}
else if(((i0&0x7fffffff)|i1)!=0)
{ i0=0xbff00000;i1=0;}
}
} else {
- i = (0x000fffff)>>j0;
+ i = (0x000fffff)>>_j0;
if(((i0&i)|i1)==0) return x; /* x is integral */
if(huge+x>0.0) { /* raise inexact flag */
- if(i0<0) i0 += (0x00100000)>>j0;
+ if(i0<0) i0 += (0x00100000)>>_j0;
i0 &= (~i); i1=0;
}
}
- } else if (j0>51) {
- if(j0==0x400) return x+x; /* inf or NaN */
+ } else if (_j0>51) {
+ if(_j0==0x400) return x+x; /* inf or NaN */
else return x; /* x is integral */
} else {
- i = ((u_int32_t)(0xffffffff))>>(j0-20);
+ i = ((u_int32_t)(0xffffffff))>>(_j0-20);
if((i1&i)==0) return x; /* x is integral */
if(huge+x>0.0) { /* raise inexact flag */
if(i0<0) {
- if(j0==20) i0+=1;
+ if(_j0==20) i0+=1;
else {
- j = i1+(1<<(52-j0));
+ j = i1+(1<<(52-_j0));
if(j<i1) i0 +=1 ; /* got a carry */
i1=j;
}