Merge r107985 from HEAD.

svn path=/branches/mono-2-0/mono/; revision=107988
baulig · Jul 15, 2008 · 6bc7124 · 6bc7124
1 parent 3134972
commit 6bc7124
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-15  Zoltan Varga  <vargaz@gmail.com>
+
+	* decimal.c (my_g_bit_nth_msf): Implement this directly without calling
+	g_bit_nth_msf () since that macro is not implemented in glib.
+
 2008-07-13  Zoltan Varga  <vargaz@gmail.com>
 
 	* class.c (mono_class_generic_sharing_enabled): Always disable generic sharing

diff --git a/mono/metadata/decimal.c b/mono/metadata/decimal.c
@@ -579,7 +579,15 @@ my_g_bit_nth_msf (gsize mask)
 		return bIndex;
 	return -1;
 #else
-	return g_bit_nth_msf (mask, sizeof (gsize) * 8);
+	int i;
+
+	i = sizeof (gsize) * 8;
+	while (i > 0) {
+		i --;
+		if (mask & (1UL << i))
+			return i;
+	}
+	return -1;
 #endif
 }