2004-09-29 Zoltan Varga <vargaz@freemail.hu>

	* Marshal.cs: Make GetFunctionPointerForDelegate icall private.

	* MarshalAsAttribute.cs: Add 2.0 IidParamIndex field.

svn path=/trunk/mcs/; revision=34514

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
index a2ff7c269a89dc9e67d8ddce1c96f2f06ca8ecd5..de28f64cc7a8880466fae6ad7a2dc7c21670b7c8 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-29  Zoltan Varga  <vargaz@freemail.hu>
+
+       * Marshal.cs: Make GetFunctionPointerForDelegate icall private.
+
+       * MarshalAsAttribute.cs: Add 2.0 IidParamIndex field.
+
 2004-09-28  Zoltan Varga  <vargaz@freemail.hu>
 
        * Marshal.cs: Add some ReliabilityContractAttributes.

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
index dee7f045d063b294a5c43ad06df284454bd7b33f..d4198e9a663badbd6e2899348c22bf8c327906c4 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
@@ -765,7 +765,7 @@ namespace System.Runtime.InteropServices
                }
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               public static extern IntPtr GetFunctionPointerForDelegateInternal (Delegate d);
+               private static extern IntPtr GetFunctionPointerForDelegateInternal (Delegate d);
                
                public static IntPtr GetFunctionPointerForDelegate (Delegate d) {
                        if (d == null)

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs
index 4084e746f28a50dfd213f5eec360f19d6f19a55f..4c7695e2b167c74ee07f43ea19b6d65a09f8d902 100755 (executable)
--- a/mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs
@@ -44,6 +44,9 @@ namespace System.Runtime.InteropServices {
                public int SizeConst;
                public short SizeParamIndex;
                public Type SafeArrayUserDefinedSubType;
+#if NET_2_0
+               public int IidParamIndex;
+#endif
 
                public MarshalAsAttribute (short unmanagedType) {
                        utype = (UnmanagedType)unmanagedType;
@@ -54,6 +57,5 @@ namespace System.Runtime.InteropServices {
                public UnmanagedType Value {
                        get {return utype;}
                }
-               
        }
 }