X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Fmath.h;h=bc0159e63c4d878ce4dad9429975ea2ced0ef9bf;hb=e7655ed37bc9c2d79d921af4f287ee5cf2788661;hp=e7220aeb3218212cc65eef6a9af5a5e3b6b28595;hpb=8e092217dd92ad3e95257255602c711b3304e38f;p=musl

diff --git a/include/math.h b/include/math.h
index e7220aeb..bc0159e6 100644
--- a/include/math.h
+++ b/include/math.h
@@ -25,7 +25,7 @@ extern "C" {
 #define HUGE_VALL ((long double)INFINITY)
 
 #define MATH_ERRNO  1
-#define MATH_EXCEPT 2
+#define MATH_ERREXCEPT 2
 #define math_errhandling 2
 
 #define FP_ILOGBNAN (((unsigned)-1)>>1)
@@ -41,8 +41,11 @@ int __fpclassify(double);
 int __fpclassifyf(float);
 int __fpclassifyl(long double);
 
-#define __FLOAT_BITS(f) (((union { float __f; __uint32_t __i; }){ (float)(f) }).__i)
-#define __DOUBLE_BITS(f) (((union { double __f; __uint64_t __i; }){ (double)(f) }).__i)
+union __float_repr { float __f; __uint32_t __i; };
+union __double_repr { double __f; __uint64_t __i; };
+
+#define __FLOAT_BITS(f) (((union __float_repr){ (float)(f) }).__i)
+#define __DOUBLE_BITS(f) (((union __double_repr){ (double)(f) }).__i)
 
 #define fpclassify(x) ( \
 	sizeof(x) == sizeof(float) ? __fpclassifyf(x) : \
@@ -74,8 +77,8 @@ int __signbitf(float);
 int __signbitl(long double);
 
 #define signbit(x) ( \
-	sizeof(x) == sizeof(float) ? !!(__FLOAT_BITS(x) & 0x80000000) : \
-	sizeof(x) == sizeof(double) ? !!(__DOUBLE_BITS(x) & (__uint64_t)1<<63) : \
+	sizeof(x) == sizeof(float) ? (int)(__FLOAT_BITS(x)>>31) : \
+	sizeof(x) == sizeof(double) ? (int)(__DOUBLE_BITS(x)>>63) : \
 	__signbitl(x) )
 
 #define isunordered(x,y) (isnan((x)) ? ((void)(y),1) : isnan((y)))