Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Krell <jaykrell@microsoft.com>2019-12-11 22:40:27 +0300
committerAleksey Kliger (λgeek) <alklig@microsoft.com>2019-12-11 22:40:27 +0300
commit256eda8c7f1d4d18578388284aa224c7b22df75a (patch)
tree7fff62c0a87344c20d74152f7165353e4a9a8006 /mcs/class/System
parent0e05bda2356e453e6ab5ae8745c86bddf82b9ce6 (diff)
Make Socket.Socket_icall static, as most icalls are, removing the first, unused parameter. (#18130)
Also partial undo recent and append _icall to end. This is verbose, but maybe worthwhile to aid search. This is extracted from https://github.com/mono/mono/pull/17978.
Diffstat (limited to 'mcs/class/System')
-rw-r--r--mcs/class/System/System.Net.Sockets/Socket.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index 5779224e099..eec2572fd7f 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -163,7 +163,7 @@ namespace System.Net.Sockets
/* Creates a new system socket, returning the handle */
[MethodImplAttribute(MethodImplOptions.InternalCall)]
- extern IntPtr Socket_icall (AddressFamily family, SocketType type, ProtocolType proto, out int error);
+ extern static IntPtr Socket_icall (AddressFamily family, SocketType type, ProtocolType proto, out int error);
#endregion
@@ -1121,7 +1121,7 @@ namespace System.Net.Sockets
// an error. Better to just close the socket and move on.
sockares.socket.connect_in_progress = false;
sockares.socket.m_Handle.Dispose ();
- sockares.socket.m_Handle = new SafeSocketHandle (sockares.socket.Socket_icall (sockares.socket.addressFamily, sockares.socket.socketType, sockares.socket.protocolType, out error), true);
+ sockares.socket.m_Handle = new SafeSocketHandle (Socket_icall (sockares.socket.addressFamily, sockares.socket.socketType, sockares.socket.protocolType, out error), true);
if (error != 0) {
sockares.Complete (new SocketException (error), true);
return false;