X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fmath.h;h=677248287ae99470346db96e5d64926ed12b7645;hp=cc9befb7f3bdfea6639ab12b99b7275808786c9f;hb=a6540174be064806b6eb4dc6abff48a9b4facfdd;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/include/math.h b/include/math.h
index cc9befb7..67724828 100644
--- a/include/math.h
+++ b/include/math.h
@@ -6,20 +6,6 @@
 #define __NEED___uint64_t
 #include <bits/alltypes.h>
 
-#define M_E             2.7182818284590452354   /* e */
-#define M_LOG2E         1.4426950408889634074   /* log_2 e */
-#define M_LOG10E        0.43429448190325182765  /* log_10 e */
-#define M_LN2           0.69314718055994530942  /* log_e 2 */
-#define M_LN10          2.30258509299404568402  /* log_e 10 */
-#define M_PI            3.14159265358979323846  /* pi */
-#define M_PI_2          1.57079632679489661923  /* pi/2 */
-#define M_PI_4          0.78539816339744830962  /* pi/4 */
-#define M_1_PI          0.31830988618379067154  /* 1/pi */
-#define M_2_PI          0.63661977236758134308  /* 2/pi */
-#define M_2_SQRTPI      1.12837916709551257390  /* 2/sqrt(pi) */
-#define M_SQRT2         1.41421356237309504880  /* sqrt(2) */
-#define M_SQRT1_2       0.70710678118654752440  /* 1/sqrt(2) */
-
 #define __MAKE_FLOAT(i) (((union { int __i; float __f; }){ .__i = i }).__f)
 
 #define NAN       __MAKE_FLOAT(0x7fc00000)
@@ -58,6 +44,24 @@ int __fpclassifyl(long double);
 #define isnormal(x) (fpclassify(x) == FP_NORMAL)
 #define isfinite(x) (fpclassify(x) > FP_INFINITE)
 
+#define isunordered(x,y) (isnan((x)) ? ((y),1) : isnan((y)))
+
+static inline int __isrel(long double __x, long double __y, int __rel)
+{
+	if (isunordered(__x, __y)) return 0;
+	if (__rel==-2) return __x < __y;
+	if (__rel==2) return __x > __y;
+	if (__rel==-1) return __x <= __y;
+	if (__rel==1) return __x >= __y;
+	return __x != __y;
+}
+
+#define isless(x,y) __isrel((x), (y), -2)
+#define islessequal(x,y) __isrel((x), (y), -1)
+#define islessgreater(x,y) __isrel((x), (y), 0)
+#define isgreaterequal(x,y) __isrel((x), (y), 1)
+#define isgreater(x,y) __isrel((x), (y), 2)
+
 double      acos(double);
 float       acosf(float);
 long double acosl(long double);
@@ -286,15 +290,31 @@ double      trunc(double);
 float       truncf(float);
 long double truncl(long double);
 
-/* XSI stuff */
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+#define M_E             2.7182818284590452354   /* e */
+#define M_LOG2E         1.4426950408889634074   /* log_2 e */
+#define M_LOG10E        0.43429448190325182765  /* log_10 e */
+#define M_LN2           0.69314718055994530942  /* log_e 2 */
+#define M_LN10          2.30258509299404568402  /* log_e 10 */
+#define M_PI            3.14159265358979323846  /* pi */
+#define M_PI_2          1.57079632679489661923  /* pi/2 */
+#define M_PI_4          0.78539816339744830962  /* pi/4 */
+#define M_1_PI          0.31830988618379067154  /* 1/pi */
+#define M_2_PI          0.63661977236758134308  /* 2/pi */
+#define M_2_SQRTPI      1.12837916709551257390  /* 2/sqrt(pi) */
+#define M_SQRT2         1.41421356237309504880  /* sqrt(2) */
+#define M_SQRT1_2       0.70710678118654752440  /* 1/sqrt(2) */
 double      j0(double);
 double      j1(double);
 double      jn(int, double);
-double      scalb(double, double);
 double      y0(double);
 double      y1(double);
 double      yn(int, double);
-
 extern int signgam;
+#endif
+
+#ifdef _GNU_SOURCE
+double      scalb(double, double);
+#endif
 
 #endif