Merge pull request #1325 from madrang/CryptoToolsCtorCheck

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels.Ipc / IpcChannel.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs
index fdb89127181ccd492ba528d2fd411d8331a276d0..0b53f638b35c9846bf02b9d709706c6f1418e206 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc/IpcChannel.cs
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
 //\r
 \r
-#if NET_2_0\r
 \r
 using System;\r
 using System.Collections;\r
@@ -46,7 +45,7 @@ namespace System.Runtime.Remoting.Channels.Ipc
                 {\r
                         get { \r
                                 int p = (int) Environment.OSVersion.Platform;\r
-                                return ((p == 4) || (p == 128));\r
+                                return ((p == 4) || (p == 128) || (p == 6));\r
                         }\r
                 }\r
 \r
@@ -86,16 +85,16 @@ namespace System.Runtime.Remoting.Channels.Ipc
                         get { return _innerChannel.ChannelPriority; }\r
                 }\r
 \r
-                public string Parse (string url, out string objectUri)\r
+                public string Parse (string url, out string objectURI)\r
                 {\r
-                        return _innerChannel.Parse (url, out objectUri);\r
+                        return _innerChannel.Parse (url, out objectURI);\r
                 }\r
 \r
                 public IMessageSink CreateMessageSink (string url,\r
                                                        object remoteChannelData,\r
-                                                       out string objectUri)\r
+                                                       out string objectURI)\r
                 {\r
-                        return ((IChannelSender)_innerChannel).CreateMessageSink (url, remoteChannelData, out objectUri);\r
+                        return ((IChannelSender)_innerChannel).CreateMessageSink (url, remoteChannelData, out  objectURI);\r
                 }\r
 \r
                 public object ChannelData\r
@@ -103,9 +102,9 @@ namespace System.Runtime.Remoting.Channels.Ipc
                         get { return ((IChannelReceiver)_innerChannel).ChannelData; }\r
                 }\r
 \r
-                public string[] GetUrlsForUri (string objectUri)\r
+                public string[] GetUrlsForUri (string objectURI)\r
                 {\r
-                        return ((IChannelReceiver)_innerChannel).GetUrlsForUri (objectUri);\r
+                        return ((IChannelReceiver)_innerChannel).GetUrlsForUri (objectURI);\r
                 }\r
 \r
                 public void StartListening (object data)\r
@@ -121,4 +120,3 @@ namespace System.Runtime.Remoting.Channels.Ipc
         }\r
 }\r
 \r
-#endif\r