===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/math.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- OpenXM_contrib2/asir2000/builtin/math.c	2011/08/24 07:20:09	1.9
+++ OpenXM_contrib2/asir2000/builtin/math.c	2015/08/14 13:51:54	1.12
@@ -45,11 +45,14 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/math.c,v 1.8 2003/12/26 05:47:37 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/math.c,v 1.11 2015/08/06 10:01:52 fujimoto Exp $ 
 */
 #include "ca.h"
 #include <math.h>
 #include "parse.h"
+#if defined(VISUAL) || defined(__MINGW32__)
+#include <float.h>
+#endif
 
 void Pdsqrt(),Pdsin(),Pdcos(),Pdtan(),Pdasin(),Pdacos(),Pdatan(),Pdlog(),Pdexp();
 void Pabs(),Pdfloor(),Pdceil(),Pdrint(),Pdisnan();
@@ -255,7 +258,7 @@ Q *rp;
 		a = -a;
 	} else
 		sgn = 1;
-#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64)
+#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__MINGW32__) || defined(__x86_64)
 	au = ((unsigned int *)&a)[1];
 	al = ((unsigned int *)&a)[0];
 #else
@@ -298,7 +301,7 @@ Q *rp;
 		a = -a;
 	} else
 		sgn = 1;
-#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64)
+#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__MINGW32__) || defined(__x86_64)
 	au = ((unsigned int *)&a)[1];
 	al = ((unsigned int *)&a)[0];
 #else
@@ -328,7 +331,7 @@ Q *rp;
 		*rp = 0;
 		return;
 	}
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	d = ToReal(ARG0(arg));
 	if ( d > 0 )
 		d = floor(d+0.5);
@@ -345,7 +348,7 @@ Q *rp;
 		a = -a;
 	} else
 		sgn = 1;
-#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64)
+#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__MINGW32__) || defined(__x86_64)
 	au = ((unsigned int *)&a)[1];
 	al = ((unsigned int *)&a)[0];
 #else
@@ -366,6 +369,9 @@ void Pdisnan(NODE arg,Q *rp)
 {
 	Real r;
 	double d;
+#if defined(VISUAL) || defined(__MINGW32__)
+    int c;
+#endif
 
 	r = (Real)ARG0(arg);
 	if ( !r || !NUM(r) || !REAL(r) ) {
@@ -373,7 +379,13 @@ void Pdisnan(NODE arg,Q *rp)
 		return;
 	}
 	d = ToReal(r);
+#if defined(VISUAL) || defined(__MINGW32__)
+	c = _fpclass(d);
+	if ( c == _FPCLASS_SNAN || c == _FPCLASS_QNAN ) *rp = ONE;
+	else if ( c == _FPCLASS_PINF || c == _FPCLASS_NINF ) STOQ(2,*rp);
+#else
 	if ( isnan(d) ) *rp = ONE;
 	else if ( isinf(d) ) STOQ(2,*rp);
+#endif
 	else *rp = 0;
 }