Merge pull request #3059 from lateralusX/jlorenss/win-x64-dyncall-gsharedvt-support

[mono.git] / mcs / class / corlib / System.Runtime.Remoting / RemotingServices.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
index c0015138cd35639c9a79dda46921f71ca1806a19..1b35fe1ee90b75337e05ce72f68a2e9017a9bc7f 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -477,7 +477,7 @@ namespace System.Runtime.Remoting
                public static bool IsMethodOverloaded(IMethodMessage msg)
                {
                        const BindingFlags bfinst = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
-                       MonoType type = (MonoType) msg.MethodBase.DeclaringType;
+                       RuntimeType type = (RuntimeType) msg.MethodBase.DeclaringType;
                        return type.GetMethodsByName (msg.MethodName, bfinst, false, type).Length > 1;
                }
 
@@ -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;
                        }
                }