Author: joncham
Date: 2006-06-09 08:35:48 -0400 (Fri, 09 Jun 2006)
New Revision: 61596
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/icall.c
trunk/mono/mono/metadata/marshal.c
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-exceptions.c
Log:
Minor fixes for building mono in Visual Studio.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2006-06-09 12:29:43 UTC (rev 61595)
+++ trunk/mono/mono/metadata/ChangeLog 2006-06-09 12:35:48 UTC (rev 61596)
@@ -1,3 +1,7 @@
+2006-06-09 Jonathan Chambers <[EMAIL PROTECTED]>
+
+ * marshal.c icall.c: Minor fixes for building mono in Visual Studio.
+
2006-06-09 Martin Baulig <[EMAIL PROTECTED]>
* debug-mono-symfile.c: Put this back and really fix it this
Modified: trunk/mono/mono/metadata/icall.c
===================================================================
--- trunk/mono/mono/metadata/icall.c 2006-06-09 12:29:43 UTC (rev 61595)
+++ trunk/mono/mono/metadata/icall.c 2006-06-09 12:35:48 UTC (rev 61596)
@@ -4656,11 +4656,12 @@
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);
Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c 2006-06-09 12:29:43 UTC (rev 61595)
+++ trunk/mono/mono/metadata/marshal.c 2006-06-09 12:35:48 UTC (rev 61596)
@@ -8250,11 +8250,11 @@
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");
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2006-06-09 12:29:43 UTC (rev 61595)
+++ trunk/mono/mono/mini/ChangeLog 2006-06-09 12:35:48 UTC (rev 61596)
@@ -1,3 +1,7 @@
+2006-06-09 Jonathan Chambers <[EMAIL PROTECTED]>
+
+ * mini-exceptions.c: Minor fix for building mono in Visual Studio.
+
2006-06-08 Massimiliano Mantione <[EMAIL PROTECTED]>
* ssapre-cee-ops.h: Renamed as "simple-cee-ops.h"
Modified: trunk/mono/mono/mini/mini-exceptions.c
===================================================================
--- trunk/mono/mono/mini/mini-exceptions.c 2006-06-09 12:29:43 UTC (rev
61595)
+++ trunk/mono/mono/mini/mini-exceptions.c 2006-06-09 12:35:48 UTC (rev
61596)
@@ -83,7 +83,7 @@
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;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
