Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -819,7 +819,9 @@ namespace System.Runtime.Remoting
 					}
 					catch (Exception e) {
 						if (e is ThreadAbortException) {
+#if MONO_FEATURE_THREAD_ABORT
 							Thread.ResetAbort ();
+#endif
 							retry = 5;
 							ex = e;
 						}
@@ -840,7 +842,9 @@ namespace System.Runtime.Remoting
 			catch (Exception tex)
 			{
 				byte[] data = SerializeExceptionData (tex);
+#if MONO_FEATURE_THREAD_ABORT
 				Thread.ResetAbort ();
+#endif
 				return data;
 			}
 		}