From 1dd9bcf3d5c5e102e87dc2b95b4aa81ded7008f5 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 6 Oct 2015 13:31:54 +0200 Subject: [PATCH] Make Thread.Abort and Thread.Suspend/Resume configurable features. --- .../referencesource/mscorlib/system/threading/thread.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mcs/class/referencesource/mscorlib/system/threading/thread.cs b/mcs/class/referencesource/mscorlib/system/threading/thread.cs index 70559108ed3..dbe81e12e76 100644 --- a/mcs/class/referencesource/mscorlib/system/threading/thread.cs +++ b/mcs/class/referencesource/mscorlib/system/threading/thread.cs @@ -558,7 +558,7 @@ namespace System.Threading { [MethodImplAttribute(MethodImplOptions.InternalCall)] private extern void AbortInternal(); #endif -#if !FEATURE_CORECLR || MONO +#if (!FEATURE_CORECLR && !MONO) || MONO_FEATURE_THREAD_ABORT /*========================================================================= ** Resets a thread abort. ** Should be called by trusted code only @@ -578,7 +578,8 @@ namespace System.Threading { [ResourceExposure(ResourceScope.None)] [MethodImplAttribute(MethodImplOptions.InternalCall)] private extern void ResetAbortNative(); - +#endif +#if (!FEATURE_CORECLR && !MONO) || MONO_FEATURE_THREAD_SUSPEND_RESUME /*========================================================================= ** Suspends the thread. If the thread is already suspended, this call has ** no effect. -- 2.25.1