Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libm/src/e_hypot.c,v
retrieving revision 1.12
retrieving revision 1.12.30.1
diff -u -p -r1.12 -r1.12.30.1
--- src/lib/libm/src/e_hypot.c	2002/05/26 22:01:50	1.12
+++ src/lib/libm/src/e_hypot.c	2008/05/18 12:30:39	1.12.30.1
@@ -12,7 +12,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_hypot.c,v 1.12 2002/05/26 22:01:50 wiz Exp $");
+__RCSID("$NetBSD: e_hypot.c,v 1.12.30.1 2008/05/18 12:30:39 yamt Exp $");
 #endif
 
 /* __ieee754_hypot(x,y)
@@ -31,9 +31,9 @@ __RCSID("$NetBSD: e_hypot.c,v 1.12 2002/
  *		x1*x1+(y*y+(x2*(x+x1))) for x*x+y*y
  *	where x1 = x with lower 32 bits cleared, x2 = x-x1; else
  *	2. if x <= 2y use
- *		t1*y1+((x-y)*(x-y)+(t1*y2+t2*y))
+ *		t1*yy1+((x-y)*(x-y)+(t1*y2+t2*y))
  *	where t1 = 2x with lower 32 bits cleared, t2 = 2x-t1,
- *	y1= y with lower 32 bits chopped, y2 = y-y1.
+ *	yy1= y with lower 32 bits chopped, y2 = y-yy1.
  *
  *	NOTE: scaling may be necessary if some argument is too
  *	      large or too tiny
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: e_hypot.c,v 1.12 2002/
 double
 __ieee754_hypot(double x, double y)
 {
-	double a=x,b=y,t1,t2,y1,y2,w;
+	double a=x,b=y,t1,t2,yy1,y2,w;
 	int32_t j,k,ha,hb;
 
 	GET_HIGH_WORD(ha,x);
@@ -107,13 +107,13 @@ __ieee754_hypot(double x, double y)
 	    w  = __ieee754_sqrt(t1*t1-(b*(-b)-t2*(a+t1)));
 	} else {
 	    a  = a+a;
-	    y1 = 0;
-	    SET_HIGH_WORD(y1,hb);
-	    y2 = b - y1;
+	    yy1 = 0;
+	    SET_HIGH_WORD(yy1,hb);
+	    y2 = b - yy1;
 	    t1 = 0;
 	    SET_HIGH_WORD(t1,ha+0x00100000);
 	    t2 = a - t1;
-	    w  = __ieee754_sqrt(t1*y1-(w*(-w)-(t1*y2+t2*b)));
+	    w  = __ieee754_sqrt(t1*yy1-(w*(-w)-(t1*y2+t2*b)));
 	}
 	if(k!=0) {
 	    u_int32_t high;