mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.6.0.125

Browse Source 
Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
View File

@@ -412,7 +412,7 @@ namespace System.Runtime.InteropServices
var errorInfo = new ManagedErrorInfo(e);
SetErrorInfo (0, errorInfo);
return e.hresult;
return e._HResult;
#else
return -1;
#endif
@@ -1591,7 +1591,7 @@ namespace System.Runtime.InteropServices
}
}
if (info is ManagedErrorInfo && ((ManagedErrorInfo) info).Exception.hresult == errorCode) {
if (info is ManagedErrorInfo && ((ManagedErrorInfo) info).Exception._HResult == errorCode) {
return ((ManagedErrorInfo) info).Exception;
}
@@ -1664,5 +1664,9 @@ namespace System.Runtime.InteropServices
return GetFunctionPointerForDelegateInternal ((Delegate)(object)d);
}
internal static void SetLastWin32Error (int error)
{
}
}
}