From: Jonathan Chambers <joncham@gmail.com>
Date: Fri, 9 Jun 2006 12:35:48 +0000 (-0000)
Subject: Minor fixes for building mono in Visual Studio.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=a51c97c291f9a62703a935a91620bb01cb870feb;p=mono.git

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 7ea78a7e9b0..44a59b5244d 100644
--- 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 ad2580f5592..702cdaa971d 100644
--- 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 5dabb7914e0..6faad83cd20 100644
--- 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 bf0e9f98209..1f8cd18fad1 100644
--- 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 e5488a07d26..4831250b0bd 100644
--- 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;