Make Thread.Abort and Thread.Suspend/Resume configurable features.

diff --git a/mcs/class/referencesource/mscorlib/system/threading/thread.cs b/mcs/class/referencesource/mscorlib/system/threading/thread.cs
index 70559108ed30b97f85a93ae0bf61c01a2b5e9b93..dbe81e12e7628325e3c1d646caedf02f9e427f3f 100644 (file)
--- 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.