Minor fixes for building mono in Visual Studio.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 7ea78a7e9b0d4b9d0cdb13db85b9bd7a8d42652e..44a59b5244d08e1f447eb110155d264b4a4c6948 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-09  Jonathan Chambers  <jonathan.chambers@ansys.com>
+
+       * marshal.c icall.c: Minor fixes for building mono in Visual Studio.
+       
 2006-06-09  Martin Baulig  <martin@ximian.com>
 
        * debug-mono-symfile.c: Put this back and really fix it this

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index ad2580f55928b83d43635f35d23a995c553dabe6..702cdaa971de08329918a46f3af0554ddaa5b881 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -4656,11 +4656,12 @@ ves_icall_System_Reflection_Assembly_GetTypes (MonoReflectionAssembly *assembly,
        if (list) {
                GList *tmp = NULL;
                MonoException *exc = NULL;
+               MonoArray *exl = NULL;
                int length = g_list_length (list);
 
                mono_loader_clear_error ();
 
-               MonoArray *exl = mono_array_new (domain, mono_defaults.exception_class, length);
+               exl = mono_array_new (domain, mono_defaults.exception_class, length);
                for (i = 0, tmp = list; i < length; i++, tmp = tmp->next) {
                        MonoException *exc = mono_class_get_exception_for_failure (tmp->data);
                        mono_array_setref (exl, i, exc);

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 5dabb7914e068f26b05d81cad763e8811d6df0b6..6faad83cd2014749e3628bdfcd863c7a5bb41df6 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -8250,11 +8250,11 @@ ves_icall_System_Runtime_InteropServices_Marshal_FreeBSTR (gpointer ptr)
 guint32
 ves_icall_System_Runtime_InteropServices_Marshal_GetComSlotForMethodInfoInternal (MonoReflectionMethod *m)
 {
-       MONO_ARCH_SAVE_REGS;
        static MonoClass *interface_type_attribute = NULL;
        MonoInterfaceTypeAttribute* itf_attr = NULL; 
        MonoCustomAttrInfo *cinfo = NULL;
        guint32 offset = 7; 
+       MONO_ARCH_SAVE_REGS;
 
        if (!interface_type_attribute)
                interface_type_attribute = mono_class_from_name (mono_defaults.corlib, "System.Runtime.InteropServices", "InterfaceTypeAttribute");

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index bf0e9f982095ef3aa413a6f4e51f90efb115c4f4..1f8cd18fad1a8f9cbbf6ea0d4e2b1d9218ad6fc5 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-09  Jonathan Chambers  <jonathan.chambers@ansys.com>
+
+       * mini-exceptions.c: Minor fix for building mono in Visual Studio.
+
 2006-06-08  Massimiliano Mantione  <massi@ximian.com>
 
        * ssapre-cee-ops.h: Renamed as "simple-cee-ops.h"

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index e5488a07d2672f29a829ae6c9b1cc1af1b11b5e4..4831250b0bdd99e9e267a7f8e971d85073bcf291 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -83,7 +83,7 @@ mono_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *re
                else
                        real_ip = (const char*)ip;
 
-               if ((real_ip >= ji->code_start) && (real_ip <= ji->code_start + ji->code_size))
+               if ((real_ip >= start) && (real_ip <= start + ji->code_size))
                        offset = real_ip - start;
                else
                        offset = -1;