2009-04-08 Bill Holmes <billholmes54@gmail.com>

	* verify.c:  Fixing the MSVC build.

	* aot-runtime.c:  Fixing the MSVC build.

	Code is contributed under MIT/X11 license.

svn path=/trunk/mono/; revision=131356

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index ce5f62a2fcc6a6883b8b03296386f26eeceb2125..6c14ae2a72dde7848ae80a93a5b02f5cdc230b64 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-08  Bill Holmes  <billholmes54@gmail.com>
+
+       * verify.c:  Fixing the MSVC build.
+
+       Code is contributed under MIT/X11 license.
+
 2009-04-08  Sebastien Pouliot  <sebastien@ximian.com>
 
        * security-core-clr.c: Simplify get_reflection_caller not to call

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index d3d131a8907a0baca6907287ad6fae678fe1913f..367795f9fb749b9ad5a1788ca8702ea97266cab5 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -562,10 +562,11 @@ mono_generic_param_is_constraint_compatible (VerifyContext *ctx, MonoGenericPara
                if (!candidate->constraints)
                        return FALSE;
                for (target_class = target->constraints; *target_class; ++target_class) {
+                       MonoClass *tc;
                        MonoType *inflated = verifier_inflate_type (ctx, &(*target_class)->byval_arg, context);
                        if (!inflated)
                                return FALSE;
-                       MonoClass *tc = mono_class_from_mono_type (inflated);
+                       tc = mono_class_from_mono_type (inflated);
                        mono_metadata_free_type (inflated);
 
                        for (candidate_class = candidate->constraints; *candidate_class; ++candidate_class) {

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 551b14d9cdc011485d2307743c87f7be9e3d20b2..4fe4f3172e5afda0a23fc2f75adf5c285c1c5a7b 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-08  Bill Holmes  <billholmes54@gmail.com>
+
+       * aot-runtime.c:  Fixing the MSVC build.
+
+       Code is contributed under MIT/X11 license.
+
 2009-04-08  Zoltan Varga  <vargaz@gmail.com>
 
        * mini-llvm.c (mono_llvm_emit_method): Pass i1/i2 arguments as i4 since 

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 67ab495bb016151315eea5ed22ae59a9986df815..e567d71b3c49307a60cbe4e57b39234f12fb1a5d 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -352,15 +352,17 @@ decode_klass_ref (MonoAotModule *module, guint8 *buf, guint8 **endbuf)
                                gboolean is_method = decode_value (p, &p);
 
                                if (is_method) {
+                                       MonoMethod *method_def;
                                        g_assert (type == MONO_TYPE_MVAR);
-                                       MonoMethod *method_def = decode_method_ref_2 (module, p, &p);
+                                       method_def = decode_method_ref_2 (module, p, &p);
                                        if (!method_def)
                                                return NULL;
 
                                        container = mono_method_get_generic_container (method_def);
                                } else {
+                                       MonoClass *class_def;
                                        g_assert (type == MONO_TYPE_VAR);
-                                       MonoClass *class_def = decode_klass_ref (module, p, &p);
+                                       class_def = decode_klass_ref (module, p, &p);
                                        if (!class_def)
                                                return NULL;