about summary refs log tree commit diff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/math.h27
-rw-r--r--math/math_private.h8
2 files changed, 30 insertions, 5 deletions
diff --git a/math/math.h b/math/math.h
index 42f32eef14..d95755f09a 100644
--- a/math/math.h
+++ b/math/math.h
@@ -83,7 +83,7 @@ __BEGIN_DECLS
 # undef	_Mdouble_
 # undef	__MATH_PRECNAME
 
-# if __STDC__ - 0 || __GNUC__ - 0 && !defined __NO_LONG_DOUBLE_MATH
+# if (__STDC__ - 0 || __GNUC__ - 0) && !defined __NO_LONG_DOUBLE_MATH
 /* Include the file of declarations again, this time using `long double'
    instead of `double' and appending l to each function name.  */
 
@@ -166,43 +166,68 @@ enum
   };
 
 /* Return number of classification appropriate for X.  */
+#ifdef __NO_LONG_DOUBLE_MATH
+# define fpclassify(x) \
+     (sizeof (x) == sizeof (float) ? __fpclassifyf (x) : __fpclassify (x))
+#else
 # define fpclassify(x) \
      (sizeof (x) == sizeof (float) ?					      \
         __fpclassifyf (x)						      \
       : sizeof (x) == sizeof (double) ?					      \
         __fpclassify (x) : __fpclassifyl (x))
+#endif
 
 /* Return nonzero value if sign of X is negative.  */
+#ifdef __NO_LONG_DOUBLE_MATH
+# define signbit(x) \
+     (sizeof (x) == sizeof (float) ? __signbitf (x) : __signbit (x))
+#else
 # define signbit(x) \
      (sizeof (x) == sizeof (float) ?					      \
         __signbitf (x)							      \
       : sizeof (x) == sizeof (double) ?					      \
         __signbit (x) : __signbitl (x))
+#endif
 
 /* Return nonzero value if X is not +-Inf or NaN.  */
+#ifdef __NO_LONG_DOUBLE_MATH
+# define isfinite(x) \
+     (sizeof (x) == sizeof (float) ? __finitef (x) : __finite (x))
+#else
 # define isfinite(x) \
      (sizeof (x) == sizeof (float) ?					      \
         __finitef (x)							      \
       : sizeof (x) == sizeof (double) ?					      \
         __finite (x) : __finitel (x))
+#endif
 
 /* Return nonzero value if X is neither zero, subnormal, Inf, nor NaN.  */
 # define isnormal(x) (fpclassify (x) == FP_NORMAL)
 
 /* Return nonzero value if X is a NaN.  We could use `fpclassify' but
    we already have this functions `__isnan' and it is faster.  */
+#ifdef __NO_LONG_DOUBLE_MATH
+# define isnan(x) \
+     (sizeof (x) == sizeof (float) ? __isnanf (x) : __isnan (x))
+#else
 # define isnan(x) \
      (sizeof (x) == sizeof (float) ?					      \
         __isnanf (x)							      \
       : sizeof (x) == sizeof (double) ?					      \
         __isnan (x) : __isnanl (x))
+#endif
 
 /* Return nonzero value is X is positive or negative infinity.  */
+#ifdef __NO_LONG_DOUBLE_MATH
+# define isinf(x) \
+     (sizeof (x) == sizeof (float) ? __isinff (x) : __isinf (x))
+#else
 # define isinf(x) \
      (sizeof (x) == sizeof (float) ?					      \
         __isinff (x)							      \
       : sizeof (x) == sizeof (double) ?					      \
         __isinf (x) : __isinfl (x))
+#endif
 
 #endif /* Use ISO C 9X.  */
 
diff --git a/math/math_private.h b/math/math_private.h
index 6d51930230..906b1dabba 100644
--- a/math/math_private.h
+++ b/math/math_private.h
@@ -34,7 +34,7 @@
 /* A union which permits us to convert between a double and two 32 bit
    ints.  */
 
-#if BYTE_ORDER == BIG_ENDIAN
+#if __FLOAT_WORD_ORDER == BIG_ENDIAN
 
 typedef union
 {
@@ -48,7 +48,7 @@ typedef union
 
 #endif
 
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN
 
 typedef union
 {
@@ -150,7 +150,7 @@ do {								\
 /* A union which permits us to convert between a long double and
    three 32 bit ints.  */
 
-#if BYTE_ORDER == BIG_ENDIAN
+#if __FLOAT_WORD_ORDER == BIG_ENDIAN
 
 typedef union
 {
@@ -166,7 +166,7 @@ typedef union
 
 #endif
 
-#if BYTE_ORDER == LITTLE_ENDIAN
+#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN
 
 typedef union
 {