Fixing isfinite macro vs. std::isfinite error in melder.h

YannickJadoul · Feb 9, 2018 · 76b4485 · 76b4485
1 parent 57dd5fe
commit 76b4485
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/praat/sys/melder.h b/praat/sys/melder.h
@@ -676,8 +676,13 @@ void NUMscale (double *x, double xminfrom, double xmaxfrom, double xminto, doubl
 //inline static bool isdefined (double x) { return ! isinf (x) && ! isnan (x); }   /* portable */
 //inline static bool isdefined (double x) { return ((* (uint64_t *) & x) & 0x7FF0000000000000) != 0x7FF0000000000000; }
 //inline static bool isundef (double x) { return ((* (uint64_t *) & x) & 0x7FF0000000000000) == 0x7FF0000000000000; }
+#ifdef isfinite
 inline static bool isdefined (double x) { return isfinite(x); }
 inline static bool isundef (double x) { return !isfinite(x); }
+#else
+inline static bool isdefined (double x) { return std::isfinite(x); }
+inline static bool isundef (double x) { return !std::isfinite(x); }
+#endif
 
 /********** Arrays with one index (NUMarrays.cpp) **********/