X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fmath.h;h=61738e6a261f16e5650190ad265a06660e46ee0b;hp=e98715166be65c19941ae1fa6dc26c6c870df57f;hb=98c9af500125df41fdb46d7e384b00982d72493a;hpb=5657cc58e5e135bba85c9a7045e10d8de4b1be0a

diff --git a/include/math.h b/include/math.h
index e9871516..61738e6a 100644
--- a/include/math.h
+++ b/include/math.h
@@ -25,11 +25,11 @@ 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)
-#define FP_ILOGB0 (~FP_ILOGBNAN)
+#define FP_ILOGBNAN (-1-(int)(((unsigned)-1)>>1))
+#define FP_ILOGB0 FP_ILOGBNAN
 
 #define FP_NAN       0
 #define FP_INFINITE  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; }){ (f) }).__i)
-#define __DOUBLE_BITS(f) (((union { double __f; __uint64_t __i; }){ (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)))
@@ -345,6 +348,24 @@ long double truncl(long double);
 
 extern int signgam;
 
+double      j0(double);
+double      j1(double);
+double      jn(int, double);
+
+double      y0(double);
+double      y1(double);
+double      yn(int, double);
+#endif
+
+#ifdef _GNU_SOURCE
+double      scalb(double, double);
+float       scalbf(float, float);
+long double scalbl(long double, long double);
+
+void        sincos(double, double*, double*);
+void        sincosf(float, float*, float*);
+void        sincosl(long double, long double*, long double*);
+
 double      gamma(double);
 float       gammaf(float);
 long double gammal(long double);
@@ -353,38 +374,26 @@ double      lgamma_r(double, int*);
 float       lgammaf_r(float, int*);
 long double lgammal_r(long double, int*);
 
-double      j0(double);
 float       j0f(float);
 long double j0l(long double);
-
-double      j1(double);
 float       j1f(float);
 long double j1l(long double);
-
-double      jn(int, double);
 float       jnf(int, float);
 long double jnl(int, long double);
 
-double      y0(double);
 float       y0f(float);
 long double y0l(long double);
-
-double      y1(double);
 float       y1f(float);
 long double y1l(long double);
-
-double      yn(int, double);
 float       ynf(int, float);
 long double ynl(int, long double);
-#endif
 
-#ifdef _GNU_SOURCE
-double      scalb(double, double);
-float       scalbf(float, float);
-long double scalbl(long double, long double);
-void sincosf(float, float *, float *);
-void sincos(double, double *, double *);
-void sincosl(long double, long double *, long double *);
+double      exp10(double);
+float       exp10f(float);
+long double exp10l(long double);
+double      pow10(double);
+float       pow10f(float);
+long double pow10l(long double);
 #endif
 
 #ifdef __cplusplus