Fix MinGW build

1 files changed, 3 insertions, 39 deletions

diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp
index 83d48a06e..874a6c690 100644
--- a/src/modules/math/libkvimath.cpp
+++ b/src/modules/math/libkvimath.cpp
@@ -26,7 +26,7 @@
 #include "KviModule.h"
 #include "KviCString.h"
 
-#include <math.h>
+#include <cmath>
 
 // Workaround for lost isnan and isinf definitions after
 // inclusion of iostream.h on some MacOS X systems
@@ -58,38 +58,6 @@ static bool __fncname(KviKvsModuleFunctionCall * c) \
 	return true; \
 }
 
-#ifdef COMPILE_ON_WINDOWS
-// we have to test better the results
-inline static double cbrt(double x)
-{
-	if (x > 0.0) return pow(x, 1.0/3.0);
-	else return -pow(-x, 1.0/3.0);
-}
-
-static int isinf (double d) {
-	int expon = 0;
-	double val = frexp (d, &expon);
-	if (expon == 1025) {
-		if (val == 0.5) return 1;
-		else if (val == -0.5) return -1;
-		else return 0;
-	} else {
-		return 0;
-	}
-}
-
-static int isnan (double d) {
-	int expon = 0;
-	double val = frexp (d, &expon);
-	if (expon == 1025) {
-		if (val == 0.5) return 0;
-		else if (val == -0.5) return 0;
-		else return 1;
-	} else {
-		return 0;
-	}
-}
-#endif
 /*
 	@doc: math.sin
 	@type:
@@ -324,7 +292,7 @@ static bool math_kvs_fnc_isnan(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("value",KVS_PT_REAL,0,dReal)
 	KVSM_PARAMETERS_END(c)
-	c->returnValue()->setBoolean(isnan(dReal));
+	c->returnValue()->setBoolean(std::isnan(dReal));
 	return true;
 }
 
@@ -347,11 +315,7 @@ static bool math_kvs_fnc_isinf(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("value",KVS_PT_REAL,0,dReal)
 	KVSM_PARAMETERS_END(c)
-#ifdef COMPILE_ON_WINDOWS
-	c->returnValue()->setBoolean(sinf(dReal));
-#else
-	c->returnValue()->setBoolean(isinf(dReal));
-#endif //COMPILE_ON_WINDOWS
+	c->returnValue()->setBoolean(std::isinf(dReal));
 	return true;
 }