diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-06-10 01:25:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-10 01:25:10 +0300 |
| commit | 80791e9aaa9b5a481534cde52c77fb8061af674e (patch) | |
| tree | 40a1bd124f58cdc3af730fcf7f8af5b661283c08 | |
| parent | ff5298840caa2863b948f5728a071709833d8628 (diff) | |
| parent | 207613a584a186f42dbd7e2f3f3555b782f25c20 (diff) | |
Merge pull request #3851 from dotnet-bot/from-tfs
Merge changes from TFS
3 files changed, 7 insertions, 2 deletions
diff --git a/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Unix.cs b/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Unix.cs index 41dae2a3a..f9e07a395 100644 --- a/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Unix.cs +++ b/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Unix.cs @@ -18,7 +18,7 @@ namespace System.Runtime.InteropServices s_lastWin32Error = Interop.Sys.GetErrNo(); } - internal static void ClearLastWin32Error() + public static void ClearLastWin32Error() { Interop.Sys.ClearErrNo(); } diff --git a/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Windows.cs b/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Windows.cs index 999b516e2..3bb267361 100644 --- a/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Windows.cs +++ b/src/System.Private.CoreLib/src/System/Runtime/InteropServices/PInvokeMarshal.Windows.cs @@ -38,7 +38,7 @@ namespace System.Runtime.InteropServices s_lastWin32Error = Interop.mincore.GetLastError(); } - internal static void ClearLastWin32Error() + public static void ClearLastWin32Error() { Interop.mincore.SetLastError(0); } diff --git a/src/System.Private.Interop/src/Shared/McgMarshal.cs b/src/System.Private.Interop/src/Shared/McgMarshal.cs index 11315c7a4..9577a33d2 100644 --- a/src/System.Private.Interop/src/Shared/McgMarshal.cs +++ b/src/System.Private.Interop/src/Shared/McgMarshal.cs @@ -49,6 +49,11 @@ namespace System.Runtime.InteropServices PInvokeMarshal.SaveLastWin32Error(); } + public static void ClearLastWin32Error() + { + PInvokeMarshal.ClearLastWin32Error(); + } + public static bool GuidEquals(ref Guid left, ref Guid right) { return InteropExtensions.GuidEquals(ref left, ref right); |