quieten compiler warnings when __UCLIBC_HAS_FENV__ isn't defined

73 files changed, 121 insertions, 121 deletions

diff --git a/libm/w_acos.c b/libm/w_acos.c
index b4751a346..421e427e7 100644
--- a/libm/w_acos.c
+++ b/libm/w_acos.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 double
 acos (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_acosf.c b/libm/w_acosf.c
index c4370a131..c1d4378d9 100644
--- a/libm/w_acosf.c
+++ b/libm/w_acosf.c
@@ -18,14 +18,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 /* wrapper acosf */
 float
 acosf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_acosh.c b/libm/w_acosh.c
index a6e1a3594..ba1c327c9 100644
--- a/libm/w_acosh.c
+++ b/libm/w_acosh.c
@@ -24,7 +24,7 @@
 double
 acosh (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
     /* acosh(x<1) */
     return __kernel_standard (x, x, 29);
diff --git a/libm/w_acoshf.c b/libm/w_acoshf.c
index b570ff92f..675473ef0 100644
--- a/libm/w_acoshf.c
+++ b/libm/w_acoshf.c
@@ -24,7 +24,7 @@
 float
 acoshf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
     /* acosh(x<1) */
     return __kernel_standard_f (x, x, 129);
diff --git a/libm/w_acoshl.c b/libm/w_acoshl.c
index 3b4860840..26384275c 100644
--- a/libm/w_acoshl.c
+++ b/libm/w_acoshl.c
@@ -24,7 +24,7 @@
 long double
 acoshl (long double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
     /* acosh(x<1) */
     return __kernel_standard_l (x, x, 229);
diff --git a/libm/w_acosl.c b/libm/w_acosl.c
index 0acc1949c..5903194d9 100644
--- a/libm/w_acosl.c
+++ b/libm/w_acosl.c
@@ -19,7 +19,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -28,7 +28,7 @@
 long double
 acosl (long double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_asin.c b/libm/w_asin.c
index 3dafd8f30..7d571cbab 100644
--- a/libm/w_asin.c
+++ b/libm/w_asin.c
@@ -18,14 +18,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 /* wrapper asin */
 double
 asin (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_asinf.c b/libm/w_asinf.c
index e9e402066..ddc1c0f54 100644
--- a/libm/w_asinf.c
+++ b/libm/w_asinf.c
@@ -18,14 +18,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 /* wrapper asinf */
 float
 asinf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_asinl.c b/libm/w_asinl.c
index ca23d8e51..3ab59f57c 100644
--- a/libm/w_asinl.c
+++ b/libm/w_asinl.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -27,7 +27,7 @@
 long double
 asinl (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_atan2.c b/libm/w_atan2.c
index 0c036e6ca..ce409614f 100644
--- a/libm/w_atan2.c
+++ b/libm/w_atan2.c
@@ -22,14 +22,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 #endif
 
 double
 atan2 (double y, double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   double z;
 
   if (__builtin_expect (x == 0.0 && y == 0.0, 0) && _LIB_VERSION == _SVID_)
@@ -43,4 +43,4 @@ atan2 (double y, double x)
   return __ieee754_atan2 (y, x);
 #endif
 }
-libm_hidden_def(atan2)
\ No newline at end of file
+libm_hidden_def(atan2)
diff --git a/libm/w_atan2f.c b/libm/w_atan2f.c
index f7bc4e66d..592e4f596 100644
--- a/libm/w_atan2f.c
+++ b/libm/w_atan2f.c
@@ -23,14 +23,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 #endif
 
 float
 atan2f (float y, float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   float z;
 
   if (__builtin_expect (x == 0.0f && y == 0.0f, 0) && _LIB_VERSION == _SVID_)
diff --git a/libm/w_atan2l.c b/libm/w_atan2l.c
index 314e72249..abf3dce5f 100644
--- a/libm/w_atan2l.c
+++ b/libm/w_atan2l.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 #endif
 
@@ -27,7 +27,7 @@
 long double
 atan2l (long double y, long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   long double z;
 
   if (__builtin_expect (x == 0.0L && y == 0.0L, 0) && _LIB_VERSION == _SVID_)
diff --git a/libm/w_atanh.c b/libm/w_atanh.c
index ef105abc3..d0375fb7e 100644
--- a/libm/w_atanh.c
+++ b/libm/w_atanh.c
@@ -24,7 +24,7 @@
 double
 atanh (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
       && _LIB_VERSION != _IEEE_)
     return __kernel_standard (x, x,
diff --git a/libm/w_atanhf.c b/libm/w_atanhf.c
index b787c2cd7..c68c54df4 100644
--- a/libm/w_atanhf.c
+++ b/libm/w_atanhf.c
@@ -24,7 +24,7 @@
 float
 atanhf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
       && _LIB_VERSION != _IEEE_)
     return __kernel_standard_f (x, x,
diff --git a/libm/w_atanhl.c b/libm/w_atanhl.c
index 77c193c4e..9a3bbede0 100644
--- a/libm/w_atanhl.c
+++ b/libm/w_atanhl.c
@@ -24,7 +24,7 @@
 long double
 atanhl (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
       && _LIB_VERSION != _IEEE_)
     return __kernel_standard_l (x, x,
diff --git a/libm/w_cosh.c b/libm/w_cosh.c
index d9a6da3df..06a9fff95 100644
--- a/libm/w_cosh.c
+++ b/libm/w_cosh.c
@@ -20,7 +20,7 @@
 double
 cosh (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	double z = __ieee754_cosh (x);
 	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_coshf.c b/libm/w_coshf.c
index 940d77876..4707ad1c3 100644
--- a/libm/w_coshf.c
+++ b/libm/w_coshf.c
@@ -24,7 +24,7 @@
 float
 coshf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	float z = (float) __ieee754_cosh ((double) x);
 	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
@@ -34,4 +34,4 @@ coshf (float x)
 #else
 	return (float) __ieee754_cosh ((double) x);
 #endif
-}
\ No newline at end of file
+}
diff --git a/libm/w_coshl.c b/libm/w_coshl.c
index 5e4814298..d6053adfa 100644
--- a/libm/w_coshl.c
+++ b/libm/w_coshl.c
@@ -26,7 +26,7 @@
 long double
 coshl (long double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	long double z = (long double) __ieee754_cosh ((double) x);
 	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_exp.c b/libm/w_exp.c
index bc65c3930..643b79f8f 100644
--- a/libm/w_exp.c
+++ b/libm/w_exp.c
@@ -24,7 +24,7 @@
 double
 exp (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   double z = __ieee754_exp (x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_exp10.c b/libm/w_exp10.c
index 120c0908e..fb4082fdc 100644
--- a/libm/w_exp10.c
+++ b/libm/w_exp10.c
@@ -27,7 +27,7 @@
 double
 exp10 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   double z = __ieee754_exp10 (x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_exp10f.c b/libm/w_exp10f.c
index cd880e3e2..a89760bca 100644
--- a/libm/w_exp10f.c
+++ b/libm/w_exp10f.c
@@ -27,7 +27,7 @@
 float
 exp10f (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   float z = (float) __ieee754_exp10 ((double) x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_exp10l.c b/libm/w_exp10l.c
index fc49e19db..807f1ca11 100644
--- a/libm/w_exp10l.c
+++ b/libm/w_exp10l.c
@@ -28,7 +28,7 @@
 long double
 exp10l (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   long double z = (long double) __ieee754_exp10 ((double) x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_exp2.c b/libm/w_exp2.c
index 1215c2e92..a81eef4ba 100644
--- a/libm/w_exp2.c
+++ b/libm/w_exp2.c
@@ -23,7 +23,7 @@
 double
 exp2 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   double z = pow(2.0, x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_exp2f.c b/libm/w_exp2f.c
index 8c337cd98..0bb57878b 100644
--- a/libm/w_exp2f.c
+++ b/libm/w_exp2f.c
@@ -8,7 +8,7 @@
 float
 exp2f (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   float z = (float) pow(2.0, (double) x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
@@ -19,4 +19,4 @@ exp2f (float x)
 #else
   return (float) pow(2.0, (double) x);
 #endif
-}
\ No newline at end of file
+}
diff --git a/libm/w_exp2l.c b/libm/w_exp2l.c
index ebf410daa..60652b124 100644
--- a/libm/w_exp2l.c
+++ b/libm/w_exp2l.c
@@ -9,7 +9,7 @@
 long double
 exp2l (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   long double z = (long double) pow(2.0, (double) x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_expf.c b/libm/w_expf.c
index 5455a24b4..fad043f5b 100644
--- a/libm/w_expf.c
+++ b/libm/w_expf.c
@@ -25,7 +25,7 @@
 float
 expf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   float z = (float) __ieee754_exp ((double) x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_expl.c b/libm/w_expl.c
index 61eef0f94..26aedf4c4 100644
--- a/libm/w_expl.c
+++ b/libm/w_expl.c
@@ -24,7 +24,7 @@
 long double
 expl (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   long double z = (long double) __ieee754_exp ((double) x);
   if (__builtin_expect (!isfinite (z) || z == 0, 0)
       && isfinite (x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_fmod.c b/libm/w_fmod.c
index 5dad58187..b5cb9d2fc 100644
--- a/libm/w_fmod.c
+++ b/libm/w_fmod.c
@@ -23,7 +23,7 @@
 double
 fmod (double x, double y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isinf (x) || y == 0.0, 0)
       && _LIB_VERSION != _IEEE_ && !isnan (y) && !isnan (x))
     /* fmod(+-Inf,y) or fmod(x,0) */
diff --git a/libm/w_fmodf.c b/libm/w_fmodf.c
index 773c90097..75a081537 100644
--- a/libm/w_fmodf.c
+++ b/libm/w_fmodf.c
@@ -23,7 +23,7 @@
 float
 fmodf (float x, float y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isinf (x) || y == 0.0f, 0)
       && _LIB_VERSION != _IEEE_ && !isnan (y) && !isnan (x))
     /* fmod(+-Inf,y) or fmod(x,0) */
diff --git a/libm/w_fmodl.c b/libm/w_fmodl.c
index cf521942e..a6aea8f7b 100644
--- a/libm/w_fmodl.c
+++ b/libm/w_fmodl.c
@@ -24,7 +24,7 @@
 long double
 fmodl (long double x, long double y)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isinf (x) || y == 0.0L, 0)
       && _LIB_VERSION != _IEEE_ && !isnan (y) && !isnan (x))
     /* fmod(+-Inf,y) or fmod(x,0) */
diff --git a/libm/w_hypot.c b/libm/w_hypot.c
index e547bfd4d..bc71999fa 100644
--- a/libm/w_hypot.c
+++ b/libm/w_hypot.c
@@ -20,7 +20,7 @@
 double
 hypot (double x, double y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	double z = __ieee754_hypot(x,y);
 	if(__builtin_expect(!isfinite(z), 0)
 	   && isfinite(x) && isfinite(y) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_hypotf.c b/libm/w_hypotf.c
index f6087174a..bdfa817e6 100644
--- a/libm/w_hypotf.c
+++ b/libm/w_hypotf.c
@@ -23,7 +23,7 @@
 float
 hypotf(float x, float y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	float z = (float) __ieee754_hypot((double) x, (double) y);
 	if(__builtin_expect(!isfinite(z), 0)
 	   && isfinite(x) && isfinite(y) && _LIB_VERSION != _IEEE_)
@@ -34,4 +34,4 @@ hypotf(float x, float y)
 #else
 	return (float) __ieee754_hypot((double) x, (double) y);
 #endif
-}
\ No newline at end of file
+}
diff --git a/libm/w_hypotl.c b/libm/w_hypotl.c
index ebbb1a1c0..7268c2488 100644
--- a/libm/w_hypotl.c
+++ b/libm/w_hypotl.c
@@ -25,7 +25,7 @@
 long double
 hypotl(long double x, long double y)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
 	long double z;
 	z = (long double) __ieee754_hypot((double) x, (double) y);
 	if(__builtin_expect(!isfinite(z), 0)
diff --git a/libm/w_j0.c b/libm/w_j0.c
index 291db8823..30a852a26 100644
--- a/libm/w_j0.c
+++ b/libm/w_j0.c
@@ -18,14 +18,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 /* wrapper j0 */
 double
 j0 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* j0(|x|>X_TLOSS) */
@@ -38,7 +38,7 @@ j0 (double x)
 double
 y0 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_j0f.c b/libm/w_j0f.c
index 24c6bfa2c..89821bc98 100644
--- a/libm/w_j0f.c
+++ b/libm/w_j0f.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -27,7 +27,7 @@
 float
 j0f (float x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* j0(|x|>X_TLOSS) */
@@ -41,7 +41,7 @@ j0f (float x)
 float
 y0f (float x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0f)
                         || isgreater (x, (float) X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_j0l.c b/libm/w_j0l.c
index 2f355709a..aeaa6c012 100644
--- a/libm/w_j0l.c
+++ b/libm/w_j0l.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -28,7 +28,7 @@
 long double
 j0l (long double x)
 {
-#  if __UCLIBC_HAS_FENV__
+#  if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* j0(|x|>X_TLOSS) */
@@ -41,7 +41,7 @@ j0l (long double x)
 long double
 y0l (long double x)
 {
-#  if __UCLIBC_HAS_FENV__
+#  if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_j1.c b/libm/w_j1.c
index f277a9e8b..68109b2a0 100644
--- a/libm/w_j1.c
+++ b/libm/w_j1.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 double
 j1 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* j1(|x|>X_TLOSS) */
@@ -39,7 +39,7 @@ j1 (double x)
 double
 y1 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_j1f.c b/libm/w_j1f.c
index 0b1a222cd..0abc250e1 100644
--- a/libm/w_j1f.c
+++ b/libm/w_j1f.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -27,7 +27,7 @@
 float
 j1f (float x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* j1(|x|>X_TLOSS) */
@@ -41,7 +41,7 @@ j1f (float x)
 float
 y1f (float x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0f)
 			|| isgreater (x, (float) X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_j1l.c b/libm/w_j1l.c
index 64bd52040..4a28bcc49 100644
--- a/libm/w_j1l.c
+++ b/libm/w_j1l.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -28,7 +28,7 @@
 long double
 j1l (long double x)
 {
-#  if __UCLIBC_HAS_FENV__
+#  if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* j1(|x|>X_TLOSS) */
@@ -41,7 +41,7 @@ j1l (long double x)
 long double
 y1l (long double x)
 {
-#  if __UCLIBC_HAS_FENV__
+#  if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_jn.c b/libm/w_jn.c
index 404a76afd..1d2f7dd19 100644
--- a/libm/w_jn.c
+++ b/libm/w_jn.c
@@ -18,14 +18,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 /* wrapper jn */
 double
 jn (int n, double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* jn(n,|x|>X_TLOSS) */
@@ -38,7 +38,7 @@ jn (int n, double x)
 double
 yn (int n, double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
     {
diff --git a/libm/w_jnf.c b/libm/w_jnf.c
index e195216be..305afbfb6 100644
--- a/libm/w_jnf.c
+++ b/libm/w_jnf.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 float
 jnf (int n, float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
     /* jn(n,|x|>X_TLOSS) */
@@ -40,7 +40,7 @@ jnf (int n, float x)
 float
 ynf (int n, float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0f)
 			|| isgreater (x, (float) X_TLOSS), 0)
       && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_jnl.c b/libm/w_jnl.c
index 773391d07..b63e59206 100644
--- a/libm/w_jnl.c
+++ b/libm/w_jnl.c
@@ -52,7 +52,7 @@ static char rcsid[] = "$NetBSD: $";
 long double
 jnl(int n, long double x)	/* wrapper jnl */
 {
-#  if __UCLIBC_HAS_FENV__
+#  if defined(__UCLIBC_HAS_FENV__)
 	long double z;
 	z = (long double) __ieee754_jn(n, (double) x);
 	if (_LIB_VERSION == _IEEE_
@@ -71,7 +71,7 @@ jnl(int n, long double x)	/* wrapper jnl */
 long double
 ynl(int n, long double x)	/* wrapper ynl */
 {
-#  if __UCLIBC_HAS_FENV__
+#  if defined(__UCLIBC_HAS_FENV__)
 	long double z;
 	z = (long double) __ieee754_yn(n,(double) x);
 	if(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;
diff --git a/libm/w_lgamma.c b/libm/w_lgamma.c
index d2fb88dcb..80d267404 100644
--- a/libm/w_lgamma.c
+++ b/libm/w_lgamma.c
@@ -34,4 +34,4 @@ libm_hidden_def(lgamma)
  * introduced tgamma name for that.
  */
 strong_alias(lgamma, gamma)
-libm_hidden_def(gamma)
\ No newline at end of file
+libm_hidden_def(gamma)
diff --git a/libm/w_lgamma_r.c b/libm/w_lgamma_r.c
index 67ece5a89..8b0670f47 100644
--- a/libm/w_lgamma_r.c
+++ b/libm/w_lgamma_r.c
@@ -21,7 +21,7 @@ libm_hidden_proto(lgamma_r)
 double
 lgamma_r(double x, int *signgamp)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	double y = __ieee754_lgamma_r(x,signgamp);
 	if(__builtin_expect(!isfinite(y), 0)
 	   && isfinite(x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_lgammaf_r.c b/libm/w_lgammaf_r.c
index 2e040c016..54e5308d3 100644
--- a/libm/w_lgammaf_r.c
+++ b/libm/w_lgammaf_r.c
@@ -24,7 +24,7 @@ libm_hidden_proto(lgammaf_r)
 float
 lgammaf_r (float x, int *signgamp)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	float y = (float) __ieee754_lgamma_r ((double)x,signgamp);
 	if(__builtin_expect(!isfinite(y), 0)
 	   && isfinite(x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_lgammal_r.c b/libm/w_lgammal_r.c
index ed85bc01b..6969cf43a 100644
--- a/libm/w_lgammal_r.c
+++ b/libm/w_lgammal_r.c
@@ -26,7 +26,7 @@ libm_hidden_proto(lgammal_r)
 long double
 lgammal_r(long double x, int *signgamp)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
 	long double y = (long double) __ieee754_lgamma_r((double)x,signgamp);
 	if(__builtin_expect(!isfinite(y), 0)
 	   && isfinite(x) && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_log.c b/libm/w_log.c
index ec4a2b005..675d6414a 100644
--- a/libm/w_log.c
+++ b/libm/w_log.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 double
 log (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0)
diff --git a/libm/w_log10.c b/libm/w_log10.c
index 1bb873a42..8beefe80a 100644
--- a/libm/w_log10.c
+++ b/libm/w_log10.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 double
 log10 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0)
diff --git a/libm/w_log10f.c b/libm/w_log10f.c
index bec12bed9..a63938ddd 100644
--- a/libm/w_log10f.c
+++ b/libm/w_log10f.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 float
 log10f (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0f)
diff --git a/libm/w_log10l.c b/libm/w_log10l.c
index 654cf736e..59fb73789 100644
--- a/libm/w_log10l.c
+++ b/libm/w_log10l.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 long double
 log10l (long double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0L)
diff --git a/libm/w_log2.c b/libm/w_log2.c
index 08433bd0c..15df7977d 100644
--- a/libm/w_log2.c
+++ b/libm/w_log2.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 double
 log2 (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0)
diff --git a/libm/w_log2f.c b/libm/w_log2f.c
index 53666b1d3..f482fb0ba 100644
--- a/libm/w_log2f.c
+++ b/libm/w_log2f.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 float
 log2f (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0)
diff --git a/libm/w_log2l.c b/libm/w_log2l.c
index cbe45ce85..33e0494de 100644
--- a/libm/w_log2l.c
+++ b/libm/w_log2l.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -27,7 +27,7 @@
 long double
 log2l (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0L)
diff --git a/libm/w_logf.c b/libm/w_logf.c
index ea1b3fd5f..f4cdf1ad6 100644
--- a/libm/w_logf.c
+++ b/libm/w_logf.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -26,7 +26,7 @@
 float
 logf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0f)
diff --git a/libm/w_logl.c b/libm/w_logl.c
index a0af4d958..a36cad13b 100644
--- a/libm/w_logl.c
+++ b/libm/w_logl.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <fenv.h>
 #endif
 
@@ -27,7 +27,7 @@
 long double
 logl (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
     {
       if (x == 0.0L)
diff --git a/libm/w_pow.c b/libm/w_pow.c
index 411330256..aee45c035 100644
--- a/libm/w_pow.c
+++ b/libm/w_pow.c
@@ -24,7 +24,7 @@
 double
 pow (double x, double y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	double z = __ieee754_pow (x, y);
   if (__builtin_expect (!isfinite (z), 0))
     {
diff --git a/libm/w_powf.c b/libm/w_powf.c
index fdfe82e8c..e42787671 100644
--- a/libm/w_powf.c
+++ b/libm/w_powf.c
@@ -23,7 +23,7 @@
 float
 powf (float x, float y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   float z = (float)  __ieee754_pow ((double) x, (double) y);
   if (__builtin_expect (!isfinite (z), 0))
     {
diff --git a/libm/w_powl.c b/libm/w_powl.c
index bd8c44393..43be78609 100644
--- a/libm/w_powl.c
+++ b/libm/w_powl.c
@@ -24,7 +24,7 @@
 long double
 powl (long double x, long double y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	long double z = (long double) __ieee754_pow ((double) x, (double) y);
   if (__builtin_expect (!isfinite (z), 0))
     {
diff --git a/libm/w_remainder.c b/libm/w_remainder.c
index b487da495..e69c6263f 100644
--- a/libm/w_remainder.c
+++ b/libm/w_remainder.c
@@ -23,7 +23,7 @@
 double
 remainder (double x, double y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (((__builtin_expect (y == 0.0, 0) && ! isnan (x))
        || (__builtin_expect (isinf (x), 0) && ! isnan (y)))
       && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_remainderf.c b/libm/w_remainderf.c
index 01e214a71..7d73ed530 100644
--- a/libm/w_remainderf.c
+++ b/libm/w_remainderf.c
@@ -23,7 +23,7 @@
 float
 remainderf (float x, float y)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (((__builtin_expect (y == 0.0f, 0) && ! isnan (x))
        || (__builtin_expect (isinf (x), 0) && ! isnan (y)))
       && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_remainderl.c b/libm/w_remainderl.c
index a74175211..c49ccf95a 100644
--- a/libm/w_remainderl.c
+++ b/libm/w_remainderl.c
@@ -24,7 +24,7 @@
 long double
 remainderl (long double x, long double y)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (((__builtin_expect (y == 0.0L, 0) && ! isnan (x))
        || (__builtin_expect (isinf (x), 0) && ! isnan (y)))
       && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_scalb.c b/libm/w_scalb.c
index c4cecc322..b89bd3052 100644
--- a/libm/w_scalb.c
+++ b/libm/w_scalb.c
@@ -19,7 +19,7 @@
 #include <math.h>
 #include "math_private.h"
 
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 
 static double
@@ -51,7 +51,7 @@ sysv_scalb (double x, double fn)
 double
 scalb (double x, double fn)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (_LIB_VERSION == _SVID_,0))
     return sysv_scalb (x, fn);
   else
diff --git a/libm/w_scalbf.c b/libm/w_scalbf.c
index 8e8a05b2e..950fef0ae 100644
--- a/libm/w_scalbf.c
+++ b/libm/w_scalbf.c
@@ -19,7 +19,7 @@
 #include <math.h>
 #include "math_private.h"
 
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 
 static float
@@ -46,7 +46,7 @@ sysv_scalbf (float x, float fn)
 float
 scalbf (float x, float fn)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (_LIB_VERSION == _SVID_, 0))
     return sysv_scalbf (x, fn);
   else
diff --git a/libm/w_scalbl.c b/libm/w_scalbl.c
index 0d5c0c791..6af6d052e 100644
--- a/libm/w_scalbl.c
+++ b/libm/w_scalbl.c
@@ -18,12 +18,12 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 #endif
 
 #if !defined __NO_LONG_DOUBLE_MATH
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
 static long double
 __attribute__ ((noinline))
 sysv_scalbl (long double x, long double fn)
@@ -48,7 +48,7 @@ sysv_scalbl (long double x, long double fn)
 long double
 scalbl (long double x, long double fn)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (_LIB_VERSION == _SVID_, 0))
     return sysv_scalbl (x, fn);
   else
@@ -80,4 +80,4 @@ scalbl (long double x, long double fn)
     return (long double) __ieee754_scalb ((double) x, (double) fn);
 # endif /* __UCLIBC_HAS_FENV__ */
 }
-#endif /* __NO_LONG_DOUBLE_MATH */
\ No newline at end of file
+#endif /* __NO_LONG_DOUBLE_MATH */
diff --git a/libm/w_sinh.c b/libm/w_sinh.c
index fa9be6bd3..6cbbf077f 100644
--- a/libm/w_sinh.c
+++ b/libm/w_sinh.c
@@ -20,7 +20,7 @@
 double
 sinh (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	double z = __ieee754_sinh (x);
 	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_sinhf.c b/libm/w_sinhf.c
index 5318c7f61..a2f70f704 100644
--- a/libm/w_sinhf.c
+++ b/libm/w_sinhf.c
@@ -23,7 +23,7 @@
 float
 sinhf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	float z = (float) __ieee754_sinh ((double) x);
 	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
diff --git a/libm/w_sinhl.c b/libm/w_sinhl.c
index cd2ab0666..0bc11dde3 100644
--- a/libm/w_sinhl.c
+++ b/libm/w_sinhl.c
@@ -25,7 +25,7 @@
 long double
 sinhl (long double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	long double z = (long double) __ieee754_sinh ((double) x);
 	if (__builtin_expect (!isfinite (z), 0) && isfinite (x)
 	    && _LIB_VERSION != _IEEE_)
@@ -36,4 +36,4 @@ sinhl (long double x)
 	return (long double) __ieee754_sinh ((double) x);
 # endif /* __UCLIBC_HAS_FENV__ */
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/libm/w_sqrt.c b/libm/w_sqrt.c
index 592fd0907..633011459 100644
--- a/libm/w_sqrt.c
+++ b/libm/w_sqrt.c
@@ -23,7 +23,7 @@
 double
 sqrt (double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
     return __kernel_standard (x, x, 26); /* sqrt(negative) */
 #endif /* __UCLIBC_HAS_FENV__ */
diff --git a/libm/w_sqrtf.c b/libm/w_sqrtf.c
index db88af412..4ffbaf84b 100644
--- a/libm/w_sqrtf.c
+++ b/libm/w_sqrtf.c
@@ -24,7 +24,7 @@
 float
 sqrtf (float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
 #endif
diff --git a/libm/w_sqrtl.c b/libm/w_sqrtl.c
index 525ac8f3c..4b37b9581 100644
--- a/libm/w_sqrtl.c
+++ b/libm/w_sqrtl.c
@@ -24,7 +24,7 @@
 long double
 sqrtl (long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
   if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
     return __kernel_standard_l (x, x, 226); /* sqrt(negative) */
 # endif /* __UCLIBC_HAS_FENV__ */
diff --git a/libm/w_tgamma.c b/libm/w_tgamma.c
index 0bacff16b..389e228ab 100644
--- a/libm/w_tgamma.c
+++ b/libm/w_tgamma.c
@@ -17,14 +17,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 #endif
 
 double
 tgamma(double x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	double y = __ieee754_tgamma(x);
 
 	if(__builtin_expect (!isfinite (y) || y == 0, 0)
diff --git a/libm/w_tgammaf.c b/libm/w_tgammaf.c
index 812e7d5b6..181a9ab91 100644
--- a/libm/w_tgammaf.c
+++ b/libm/w_tgammaf.c
@@ -15,14 +15,14 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 #endif
 
 float
 tgammaf(float x)
 {
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 	float y = (float) __ieee754_tgamma((double)x);
 
 	if(__builtin_expect (!isfinite (y) || y == 0, 0)
diff --git a/libm/w_tgammal.c b/libm/w_tgammal.c
index 64ce302c0..c97a77a2a 100644
--- a/libm/w_tgammal.c
+++ b/libm/w_tgammal.c
@@ -20,7 +20,7 @@
 
 #include <math.h>
 #include "math_private.h"
-#if __UCLIBC_HAS_FENV__
+#if defined(__UCLIBC_HAS_FENV__)
 #include <errno.h>
 #endif
 
@@ -28,7 +28,7 @@
 long double
 tgammal(long double x)
 {
-# if __UCLIBC_HAS_FENV__
+# if defined(__UCLIBC_HAS_FENV__)
 	long double y = (long double) __ieee754_tgamma((long double)x);
 
 	if(__builtin_expect (!isfinite (y) || y == 0, 0)