From: nsz <nsz@port70.net>
Date: Mon, 5 Mar 2012 15:05:19 +0000 (+0100)
Subject: update math.h: const macro conformance fixes, bithack update, warning fix
X-Git-Url: http://nsz.repo.hu/git/?p=libm;a=commitdiff_plain;h=a120fc738a91d4c87c38758ff39bc9718864ba0a;ds=sidebyside

update math.h: const macro conformance fixes, bithack update, warning fix
---

diff --git a/include/math.h b/include/math.h
index 143dba3..19097a5 100644
--- a/include/math.h
+++ b/include/math.h
@@ -12,12 +12,13 @@ extern "C" {
 #define __NEED___uint64_t
 #include <bits/alltypes.h>
 
-#define __MAKE_FLOAT(i) (((union { __uint32_t __i; float __f; }){ i }).__f)
-#define __FLOAT_BITS(f) (((union { float __f; __uint32_t __i; }){ f }).__i)
-#define __DOUBLE_BITS(f) (((union { double __f; __uint64_t __i; }){ f }).__i)
-
-#define NAN       __MAKE_FLOAT(0x7fc00000)
-#define INFINITY  __MAKE_FLOAT(0x7f800000)
+#if 100*__GNUC__+__GNUC_MINOR__ >= 303
+#define NAN       __builtin_nanf("")
+#define INFINITY  __builtin_inff()
+#else
+#define NAN       (0.0f/0.0f)
+#define INFINITY  1e40f
+#endif
 
 #define HUGE_VALF INFINITY
 #define HUGE_VAL  ((double)INFINITY)
@@ -40,6 +41,9 @@ int __fpclassify(double);
 int __fpclassifyf(float);
 int __fpclassifyl(long double);
 
+#define __FLOAT_BITS(f) (((union { float __f; __uint32_t __i; }){ (f) }).__i)
+#define __DOUBLE_BITS(f) (((union { double __f; __uint64_t __i; }){ (f) }).__i)
+
 #define fpclassify(x) ( \
 	sizeof(x) == sizeof(float) ? __fpclassifyf(x) : \
 	sizeof(x) == sizeof(double) ? __fpclassify(x) : \
@@ -47,22 +51,22 @@ int __fpclassifyl(long double);
 
 #define isinf(x) ( \
 	sizeof(x) == sizeof(float) ? (__FLOAT_BITS(x) & 0x7fffffff) == 0x7f800000 : \
-	sizeof(x) == sizeof(double) ? (__DOUBLE_BITS(x) & ~((__uint64_t)1<<63)) == (__uint64_t)0x7ff<<52 : \
+	sizeof(x) == sizeof(double) ? (__DOUBLE_BITS(x) & (__uint64_t)-1>>1) == (__uint64_t)0x7ff<<52 : \
 	__fpclassifyl(x) == FP_INFINITE)
 
 #define isnan(x) ( \
 	sizeof(x) == sizeof(float) ? (__FLOAT_BITS(x) & 0x7fffffff) > 0x7f800000 : \
-	sizeof(x) == sizeof(double) ? (__DOUBLE_BITS(x) & ~((__uint64_t)1<<63)) > (__uint64_t)0x7ff<<52 : \
+	sizeof(x) == sizeof(double) ? (__DOUBLE_BITS(x) & (__uint64_t)-1>>1) > (__uint64_t)0x7ff<<52 : \
 	__fpclassifyl(x) == FP_NAN)
 
 #define isnormal(x) ( \
-	sizeof(x) == sizeof(float) ? (__FLOAT_BITS(x)+0x00800000 & 0x7fffffff) >= 0x01000000 : \
-	sizeof(x) == sizeof(double) ? (__DOUBLE_BITS(x)+((__uint64_t)1<<52) & ~((__uint64_t)1<<63)) >= (__uint64_t)1<<53 : \
+	sizeof(x) == sizeof(float) ? ((__FLOAT_BITS(x)+0x00800000) & 0x7fffffff) >= 0x01000000 : \
+	sizeof(x) == sizeof(double) ? ((__DOUBLE_BITS(x)+((__uint64_t)1<<52)) & (__uint64_t)-1>>1) >= (__uint64_t)1<<53 : \
 	__fpclassifyl(x) == FP_NORMAL)
 
 #define isfinite(x) ( \
 	sizeof(x) == sizeof(float) ? (__FLOAT_BITS(x) & 0x7fffffff) < 0x7f800000 : \
-	sizeof(x) == sizeof(double) ? (__DOUBLE_BITS(x) & ~((__uint64_t)1<<63)) < (__uint64_t)0x7ff<<52 : \
+	sizeof(x) == sizeof(double) ? (__DOUBLE_BITS(x) & (__uint64_t)-1>>1) < (__uint64_t)0x7ff<<52 : \
 	__fpclassifyl(x) > FP_INFINITE)
 
 int __signbit(double);
@@ -75,7 +79,11 @@ int __signbitl(long double);
 	__signbitl(x) )
 
 #define isunordered(x,y) (isnan((x)) ? ((void)(y),1) : isnan((y)))
-static inline int __isrel(long double __x, long double __y, int __rel)
+
+#if __STDC_VERSION__ >= 199901L
+inline
+#endif
+static int __isrel(long double __x, long double __y, int __rel)
 {
 	if (isunordered(__x, __y)) return 0;
 	if (__rel==-2) return __x < __y;
@@ -320,7 +328,7 @@ float       truncf(float);
 long double truncl(long double);
 
 #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-#define MAXFLOAT        __MAKE_FLOAT(0x7f7fffff)
+#define MAXFLOAT        3.40282347e+38F
 #define M_E             2.7182818284590452354   /* e */
 #define M_LOG2E         1.4426950408889634074   /* log_2 e */
 #define M_LOG10E        0.43429448190325182765  /* log_10 e */