[Mono-patches] r54327 - trunk/mono/mono/dis

[Zoltan Varga (vargaz AT gmail.com)]

Author: zoltan
Date: 2005-12-13 17:19:02 -0500 (Tue, 13 Dec 2005)
New Revision: 54327

Modified:
   trunk/mono/mono/dis/ChangeLog
   trunk/mono/mono/dis/get.c
Log:
2005-12-13  Zoltan Varga  <vargaz at gmail.com>

	* get.c (get_constant): Use finite() instead of isnormal () since the
	latter is not available on solaris.


Modified: trunk/mono/mono/dis/ChangeLog
===================================================================
--- trunk/mono/mono/dis/ChangeLog	2005-12-13 22:01:44 UTC (rev 54326)
+++ trunk/mono/mono/dis/ChangeLog	2005-12-13 22:19:02 UTC (rev 54327)
@@ -1,3 +1,8 @@
+2005-12-13  Zoltan Varga  <vargaz at gmail.com>
+
+	* get.c (get_constant): Use finite() instead of isnormal () since the
+	latter is not available on solaris.
+
 2005-11-23  Ankit Jain  <jankit at novell.com>
 
 	* get.c (get_methodspec): Use mono_get_method_full so as to handle

Modified: trunk/mono/mono/dis/get.c
===================================================================
--- trunk/mono/mono/dis/get.c	2005-12-13 22:01:44 UTC (rev 54326)
+++ trunk/mono/mono/dis/get.c	2005-12-13 22:19:02 UTC (rev 54327)
@@ -2190,17 +2190,33 @@
 		return g_strdup_printf ("int64(0x%08x%08x)", high, low);
 	}
 	case MONO_TYPE_R4: {
+		gboolean normal;
 		float r;
 		readr4 (ptr, &r);
-		if (! isnormal (r))
+
+		/* Crazy solaris systems doesn't have isnormal */
+#ifdef HAVE_FINITE
+		normal = finite (r);
+#else
+		normal = isnormal (r);
+#endif
+		if (!normal)
 			return g_strdup_printf ("float32(0x%08x)", read32 (ptr));
 		else
 			return g_strdup_printf ("float32(%.20g)", r);
 	}	
 	case MONO_TYPE_R8: {
+		gboolean normal;
 		double r;
 		readr8 (ptr, &r);
-		if (! isnormal (r)) {
+
+		/* Crazy solaris systems doesn't have isnormal */
+#ifdef HAVE_FINITE
+		normal = finite (r);
+#else
+		normal = isnormal (r);
+#endif
+		if (!normal) {
 			guint32 low, high;
 			low = read32 (ptr);
 			high = read32 (ptr + 4);