This patch renames all uses of __isinf*, __isnan*, __finite* and __signbit* to use standard C99 macros. This has no effect on generated code.

52 files changed, 116 insertions, 116 deletions

diff --git a/math/e_exp10.c b/math/e_exp10.c
index d3205d1bbf..ba79906ed3 100644
--- a/math/e_exp10.c
+++ b/math/e_exp10.c
@@ -23,7 +23,7 @@
 double
 __ieee754_exp10 (double arg)
 {
-  if (__finite (arg) && arg < DBL_MIN_10_EXP - DBL_DIG - 10)
+  if (isfinite (arg) && arg < DBL_MIN_10_EXP - DBL_DIG - 10)
     return DBL_MIN * DBL_MIN;
   else
     /* This is a very stupid and inprecise implementation.  It'll get
diff --git a/math/e_exp10l.c b/math/e_exp10l.c
index 9425457749..d17366c681 100644
--- a/math/e_exp10l.c
+++ b/math/e_exp10l.c
@@ -23,7 +23,7 @@
 long double
 __ieee754_exp10l (long double arg)
 {
-  if (__finitel (arg) && arg < LDBL_MIN_10_EXP - LDBL_DIG - 10)
+  if (isfinite (arg) && arg < LDBL_MIN_10_EXP - LDBL_DIG - 10)
     return LDBL_MIN * LDBL_MIN;
   else
     /* This is a very stupid and inprecise implementation.  It'll get
diff --git a/math/e_exp2l.c b/math/e_exp2l.c
index 9eb7bafadd..8db34ada53 100644
--- a/math/e_exp2l.c
+++ b/math/e_exp2l.c
@@ -45,7 +45,7 @@ __ieee754_exp2l (long double x)
       else
 	{
 	  /* Underflow or exact zero.  */
-	  if (__isinfl (x))
+	  if (isinf (x))
 	    return 0;
 	  else
 	    return LDBL_MIN * LDBL_MIN;
diff --git a/math/e_scalb.c b/math/e_scalb.c
index 3bafde4f1a..f3dac6f45d 100644
--- a/math/e_scalb.c
+++ b/math/e_scalb.c
@@ -40,11 +40,11 @@ invalid_fn (double x, double fn)
 double
 __ieee754_scalb (double x, double fn)
 {
-  if (__glibc_unlikely (__isnan (x)))
+  if (__glibc_unlikely (isnan (x)))
     return x * fn;
-  if (__glibc_unlikely (!__finite (fn)))
+  if (__glibc_unlikely (!isfinite (fn)))
     {
-      if (__isnan (fn) || fn > 0.0)
+      if (isnan (fn) || fn > 0.0)
 	return x * fn;
       if (x == 0.0)
 	return x;
diff --git a/math/e_scalbf.c b/math/e_scalbf.c
index 81321e0c90..08e1979a2a 100644
--- a/math/e_scalbf.c
+++ b/math/e_scalbf.c
@@ -40,11 +40,11 @@ invalid_fn (float x, float fn)
 float
 __ieee754_scalbf (float x, float fn)
 {
-  if (__glibc_unlikely (__isnanf (x)))
+  if (__glibc_unlikely (isnan (x)))
     return x * fn;
-  if (__glibc_unlikely (!__finitef (fn)))
+  if (__glibc_unlikely (!isfinite (fn)))
     {
-      if (__isnanf (fn) || fn > 0.0f)
+      if (isnan (fn) || fn > 0.0f)
 	return x * fn;
       if (x == 0.0f)
 	return x;
diff --git a/math/e_scalbl.c b/math/e_scalbl.c
index 41c525d633..695a865c28 100644
--- a/math/e_scalbl.c
+++ b/math/e_scalbl.c
@@ -40,11 +40,11 @@ invalid_fn (long double x, long double fn)
 long double
 __ieee754_scalbl (long double x, long double fn)
 {
-  if (__glibc_unlikely (__isnanl (x)))
+  if (__glibc_unlikely (isnan (x)))
     return x * fn;
-  if (__glibc_unlikely (!__finitel (fn)))
+  if (__glibc_unlikely (!isfinite (fn)))
     {
-      if (__isnanl (fn) || fn > 0.0L)
+      if (isnan (fn) || fn > 0.0L)
 	return x * fn;
       if (x == 0.0L)
 	return x;
diff --git a/math/s_ldexp.c b/math/s_ldexp.c
index aa68b017f2..d2f9907790 100644
--- a/math/s_ldexp.c
+++ b/math/s_ldexp.c
@@ -20,9 +20,9 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $";
 
 double __ldexp(double value, int exp)
 {
-	if(!__finite(value)||value==0.0) return value;
+	if(!isfinite(value)||value==0.0) return value;
 	value = __scalbn(value,exp);
-	if(!__finite(value)||value==0.0) __set_errno (ERANGE);
+	if(!isfinite(value)||value==0.0) __set_errno (ERANGE);
 	return value;
 }
 weak_alias (__ldexp, ldexp)
diff --git a/math/s_ldexpf.c b/math/s_ldexpf.c
index bd946776e2..24054ffa71 100644
--- a/math/s_ldexpf.c
+++ b/math/s_ldexpf.c
@@ -23,9 +23,9 @@ static char rcsid[] = "$NetBSD: s_ldexpf.c,v 1.3 1995/05/10 20:47:42 jtc Exp $";
 
 float __ldexpf(float value, int exp)
 {
-	if(!__finitef(value)||value==(float)0.0) return value;
+	if(!isfinite(value)||value==(float)0.0) return value;
 	value = __scalbnf(value,exp);
-	if(!__finitef(value)||value==(float)0.0) __set_errno (ERANGE);
+	if(!isfinite(value)||value==(float)0.0) __set_errno (ERANGE);
 	return value;
 }
 weak_alias (__ldexpf, ldexpf)
diff --git a/math/s_ldexpl.c b/math/s_ldexpl.c
index 1bcc7680b4..7c7809f272 100644
--- a/math/s_ldexpl.c
+++ b/math/s_ldexpl.c
@@ -24,9 +24,9 @@ static char rcsid[] = "$NetBSD: $";
 
 long double __ldexpl(long double value, int exp)
 {
-	if(!__finitel(value)||value==0.0) return value;
+	if(!isfinite(value)||value==0.0) return value;
 	value = __scalbnl(value,exp);
-	if(!__finitel(value)||value==0.0) __set_errno (ERANGE);
+	if(!isfinite(value)||value==0.0) __set_errno (ERANGE);
 	return value;
 }
 weak_alias (__ldexpl, ldexpl)
diff --git a/math/w_atan2.c b/math/w_atan2.c
index 0cb69ac891..ea60ffcca4 100644
--- a/math/w_atan2.c
+++ b/math/w_atan2.c
@@ -34,7 +34,7 @@ __atan2 (double y, double x)
     return __kernel_standard (y, x, 3); /* atan2(+-0,+-0) */
 
   z = __ieee754_atan2 (y, x);
-  if (__glibc_unlikely (z == 0.0 && y != 0.0 && __finite (x)))
+  if (__glibc_unlikely (z == 0.0 && y != 0.0 && isfinite (x)))
     __set_errno (ERANGE);
   return z;
 }
diff --git a/math/w_atan2f.c b/math/w_atan2f.c
index c83088dfb9..eb7d968377 100644
--- a/math/w_atan2f.c
+++ b/math/w_atan2f.c
@@ -34,7 +34,7 @@ __atan2f (float y, float x)
     return __kernel_standard_f (y, x, 103); /* atan2(+-0,+-0) */
 
   z = __ieee754_atan2f (y, x);
-  if (__glibc_unlikely (z == 0.0f && y != 0.0f && __finitef (x)))
+  if (__glibc_unlikely (z == 0.0f && y != 0.0f && isfinite (x)))
     __set_errno (ERANGE);
   return z;
 }
diff --git a/math/w_atan2l.c b/math/w_atan2l.c
index 96b2321621..3048f97b0b 100644
--- a/math/w_atan2l.c
+++ b/math/w_atan2l.c
@@ -34,7 +34,7 @@ __atan2l (long double y, long double x)
     return __kernel_standard_l (y, x, 203); /* atan2(+-0,+-0) */
 
   z = __ieee754_atan2l (y, x);
-  if (__glibc_unlikely (z == 0.0L && y != 0.0L && __finitel (x)))
+  if (__glibc_unlikely (z == 0.0L && y != 0.0L && isfinite (x)))
     __set_errno (ERANGE);
   return z;
 }
diff --git a/math/w_cosh.c b/math/w_cosh.c
index 57010781bf..0771434ec1 100644
--- a/math/w_cosh.c
+++ b/math/w_cosh.c
@@ -21,7 +21,7 @@ double
 __cosh (double x)
 {
 	double z = __ieee754_cosh (x);
-	if (__builtin_expect (!__finite (z), 0) && __finite (x)
+	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
 		return __kernel_standard (x, x, 5); /* cosh overflow */
 
diff --git a/math/w_coshf.c b/math/w_coshf.c
index df1f681205..dc7fb53ba3 100644
--- a/math/w_coshf.c
+++ b/math/w_coshf.c
@@ -25,7 +25,7 @@ float
 __coshf (float x)
 {
 	float z = __ieee754_coshf (x);
-	if (__builtin_expect (!__finitef (z), 0) && __finitef (x)
+	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
 		return __kernel_standard_f (x, x, 105); /* cosh overflow */
 
diff --git a/math/w_coshl.c b/math/w_coshl.c
index 9c638e91e0..27f0a4f4c3 100644
--- a/math/w_coshl.c
+++ b/math/w_coshl.c
@@ -26,7 +26,7 @@ long double
 __coshl (long double x)
 {
 	long double z = __ieee754_coshl (x);
-	if (__builtin_expect (!__finitel (z), 0) && __finitel (x)
+	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
 		return __kernel_standard_l (x, x, 205); /* cosh overflow */
 
diff --git a/math/w_exp10.c b/math/w_exp10.c
index 66eec80fe1..c994a23af0 100644
--- a/math/w_exp10.c
+++ b/math/w_exp10.c
@@ -28,10 +28,10 @@ double
 __exp10 (double x)
 {
   double z = __ieee754_exp10 (x);
-  if (__builtin_expect (!__finite (z) || z == 0, 0)
-      && __finite (x) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (!isfinite (z) || z == 0, 0)
+      && isfinite (x) && _LIB_VERSION != _IEEE_)
     /* exp10 overflow (46) if x > 0, underflow (47) if x < 0.  */
-    return __kernel_standard (x, x, 46 + !!__signbit (x));
+    return __kernel_standard (x, x, 46 + !!signbit (x));
 
   return z;
 }
diff --git a/math/w_exp10f.c b/math/w_exp10f.c
index 784bae4291..4ab5bc3849 100644
--- a/math/w_exp10f.c
+++ b/math/w_exp10f.c
@@ -28,10 +28,10 @@ float
 __exp10f (float x)
 {
   float z = __ieee754_exp10f (x);
-  if (__builtin_expect (!__finitef (z) || z == 0, 0)
-      && __finitef (x) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (!isfinite (z) || z == 0, 0)
+      && isfinite (x) && _LIB_VERSION != _IEEE_)
     /* exp10f overflow (146) if x > 0, underflow (147) if x < 0.  */
-    return __kernel_standard_f (x, x, 146 + !!__signbitf (x));
+    return __kernel_standard_f (x, x, 146 + !!signbit (x));
 
   return z;
 }
diff --git a/math/w_exp10l.c b/math/w_exp10l.c
index 21226aa543..984c663303 100644
--- a/math/w_exp10l.c
+++ b/math/w_exp10l.c
@@ -28,10 +28,10 @@ long double
 __exp10l (long double x)
 {
   long double z = __ieee754_exp10l (x);
-  if (__builtin_expect (!__finitel (z) || z == 0, 0)
-      && __finitel (x) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (!isfinite (z) || z == 0, 0)
+      && isfinite (x) && _LIB_VERSION != _IEEE_)
     /* exp10l overflow (246) if x > 0, underflow (247) if x < 0.  */
-    return __kernel_standard_l (x, x, 246 + !!__signbitl (x));
+    return __kernel_standard_l (x, x, 246 + !!signbit (x));
 
   return z;
 }
diff --git a/math/w_exp2.c b/math/w_exp2.c
index 02820be373..ca17f9ea63 100644
--- a/math/w_exp2.c
+++ b/math/w_exp2.c
@@ -9,10 +9,10 @@ double
 __exp2 (double x)
 {
   double z = __ieee754_exp2 (x);
-  if (__builtin_expect (!__finite (z) || z == 0, 0)
-      && __finite (x) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (!isfinite (z) || z == 0, 0)
+      && isfinite (x) && _LIB_VERSION != _IEEE_)
     /* exp2 overflow: 44, exp2 underflow: 45 */
-    return __kernel_standard (x, x, 44 + !!__signbit (x));
+    return __kernel_standard (x, x, 44 + !!signbit (x));
 
   return z;
 }
diff --git a/math/w_exp2f.c b/math/w_exp2f.c
index 8430fd5702..61cbd6cda1 100644
--- a/math/w_exp2f.c
+++ b/