2005-06-03 Zoltan Varga <vargaz@freemail.hu>

	* MethodBuilder.cs (SetCustomAttribute): Set PinvokeImpl attribute if
	a DllImportAttribute is present.

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index 35a4f424d7dbc358fe2cf1fd7dea82daa813fdc7..0f98f60afc0a201e1fd7abfcc7480c56bdf9418e 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-03  Zoltan Varga  <vargaz@freemail.hu>
+
+       * MethodBuilder.cs (SetCustomAttribute): Set PinvokeImpl attribute if
+       a DllImportAttribute is present.
+
 2005-06-02  Zoltan Varga  <vargaz@freemail.hu>
 
        * MethodBuilder.cs (SetCustomAttribute): Handle the case when the

diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
index 17c0332309e9b9add9cfc04ef38b7983f217e650..cd0e8cecd950db1956d2b9fd690abe4d3d1d108f 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -318,6 +318,7 @@ namespace System.Reflection.Emit {
                                BestFitMapping = attr.BestFitMapping;
                                ThrowOnUnmappableChar = attr.ThrowOnUnmappableChar;
 #endif
+                               attrs |= MethodAttributes.PinvokeImpl;
                                return;
                        }
                        if (cattrs != null) {