projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[corlib] Update public api
[mono.git]
/
mcs
/
class
/
corlib
/
System.Reflection
/
MonoMethod.cs
diff --git
a/mcs/class/corlib/System.Reflection/MonoMethod.cs
b/mcs/class/corlib/System.Reflection/MonoMethod.cs
index 111387296cedafea98868ca522b631c8ff3bfdbe..a7c66597453323b962c65be5b41c476855ed0453 100644
(file)
--- a/
mcs/class/corlib/System.Reflection/MonoMethod.cs
+++ b/
mcs/class/corlib/System.Reflection/MonoMethod.cs
@@
-382,7
+382,7
@@
namespace System.Reflection {
}
[MethodImplAttribute(MethodImplOptions.InternalCall)]
}
[MethodImplAttribute(MethodImplOptions.InternalCall)]
- internal
static extern DllImportAttribute GetDllImportAttribute (IntPtr mhandl
e);
+ internal
extern void GetPInvoke (out PInvokeAttributes flags, out string entryPoint, out string dllNam
e);
internal object[] GetPseudoCustomAttributes ()
{
internal object[] GetPseudoCustomAttributes ()
{
@@
-404,10
+404,7
@@
namespace System.Reflection {
if ((info.iattrs & MethodImplAttributes.PreserveSig) != 0)
attrs [count ++] = new PreserveSigAttribute ();
if ((info.attrs & MethodAttributes.PinvokeImpl) != 0) {
if ((info.iattrs & MethodImplAttributes.PreserveSig) != 0)
attrs [count ++] = new PreserveSigAttribute ();
if ((info.attrs & MethodAttributes.PinvokeImpl) != 0) {
- DllImportAttribute attr = GetDllImportAttribute (mhandle);
- if ((info.iattrs & MethodImplAttributes.PreserveSig) != 0)
- attr.PreserveSig = true;
- attrs [count ++] = attr;
+ attrs [count ++] = DllImportAttribute.GetCustomAttribute (this);
}
return attrs;
}
return attrs;