Author: mkestner
Date: 2005-03-23 09:22:31 -0500 (Wed, 23 Mar 2005)
New Revision: 42146
Modified:
branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog
branches/gtk-sharp-1-0-branch/gtk-sharp/glib/Marshaller.cs
Log:
2005-03-23 Mike Kestner <[EMAIL PROTECTED]>
* glib/Marshaller.cs : s/ulong/UIntPtr for size_t in g_malloc usage.
Modified: branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog
===================================================================
--- branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog 2005-03-23 14:13:39 UTC
(rev 42145)
+++ branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog 2005-03-23 14:22:31 UTC
(rev 42146)
@@ -1,3 +1,7 @@
+2005-03-23 Mike Kestner <[EMAIL PROTECTED]>
+
+ * glib/Marshaller.cs : s/ulong/UIntPtr for size_t in g_malloc usage.
+
2005-03-14 Mike Kestner <[EMAIL PROTECTED]>
* configure.in : s/=/>=/ for gtkhtml-3.6 check. bump version to 1.0.8.
Modified: branches/gtk-sharp-1-0-branch/gtk-sharp/glib/Marshaller.cs
===================================================================
--- branches/gtk-sharp-1-0-branch/gtk-sharp/glib/Marshaller.cs 2005-03-23
14:13:39 UTC (rev 42145)
+++ branches/gtk-sharp-1-0-branch/gtk-sharp/glib/Marshaller.cs 2005-03-23
14:22:31 UTC (rev 42146)
@@ -68,7 +68,7 @@
// [native pointer size] * [count] bytes.
[DllImport("libglib-2.0-0.dll")]
- static extern IntPtr g_malloc(ulong size);
+ static extern IntPtr g_malloc(UIntPtr size);
static bool check_sixtyfour () {
int szint = Marshal.SizeOf (typeof (int));
@@ -90,8 +90,8 @@
for (int i = 0; i < args.Length; i++)
ptrs[i] = (int) Marshal.StringToHGlobalAuto
(args[i]);
- IntPtr buf = g_malloc ((ulong)
Marshal.SizeOf(typeof(int)) *
- (ulong) args.Length);
+ IntPtr buf = g_malloc (new UIntPtr ((ulong)
Marshal.SizeOf(typeof(int)) *
+ (ulong) args.Length));
Marshal.Copy (ptrs, 0, buf, ptrs.Length);
return buf;
}
@@ -103,8 +103,8 @@
for (int i = 0; i < args.Length; i++)
ptrs[i] = (long) Marshal.StringToHGlobalAuto
(args[i]);
- IntPtr buf = g_malloc ((ulong)
Marshal.SizeOf(typeof(long)) *
- (ulong) args.Length);
+ IntPtr buf = g_malloc (new UIntPtr ((ulong)
Marshal.SizeOf(typeof(long)) *
+ (ulong) args.Length));
Marshal.Copy (ptrs, 0, buf, ptrs.Length);
return buf;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
