[Socket] Move remaining icalls and struct from Socket_2_1.cs to Socket.cs

diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index 6667a5476662eaa1e8985bd05c83d1a6ac0c7bbc..23496fadddce4f467bcc74b7d4e5f1e5a0b1486a 100644 (file)
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -3156,6 +3156,18 @@ namespace System.Net.Sockets
 
                        return sockares;
                }
+
+               [StructLayout (LayoutKind.Sequential)]
+               struct WSABUF {
+                       public int len;
+                       public IntPtr buf;
+               }
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               internal static extern void cancel_blocking_socket_operation (Thread thread);
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               internal static extern void socket_pool_queue (SocketAsyncCallback d, SocketAsyncResult r);
        }
 }
 

diff --git a/mcs/class/System/System.Net.Sockets/Socket_2_1.cs b/mcs/class/System/System.Net.Sockets/Socket_2_1.cs
deleted file mode 100644 (file)
index 9810ce4..0000000
--- a/mcs/class/System/System.Net.Sockets/Socket_2_1.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// System.Net.Sockets.Socket.cs
-//
-// Authors:
-//     Phillip Pearson (pp@myelin.co.nz)
-//     Dick Porter <dick@ximian.com>
-//     Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//     Sridhar Kulkarni (sridharkulkarni@gmail.com)
-//     Brian Nickel (brian.nickel@gmail.com)
-//
-// Copyright (C) 2001, 2002 Phillip Pearson and Ximian, Inc.
-//    http://www.myelin.co.nz
-// (c) 2004-2011 Novell, Inc. (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.IO;
-using System.Security;
-using System.Text;
-
-#if !NET_2_1
-using System.Net.Configuration;
-using System.Net.NetworkInformation;
-#endif
-
-namespace System.Net.Sockets {
-
-       public partial class Socket : IDisposable {
-               [StructLayout (LayoutKind.Sequential)]
-               struct WSABUF {
-                       public int len;
-                       public IntPtr buf;
-               }
-
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               internal static extern void cancel_blocking_socket_operation (Thread thread);
-
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               internal static extern void socket_pool_queue (SocketAsyncCallback d, SocketAsyncResult r);
-       }
-}
-

diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources
index 97008a5fb9d95965032d6d1003b80d0c2ca88b7a..27a566c1b17d80f6835305f788aa0e86c731270d 100644 (file)
--- a/mcs/class/System/System.dll.sources
+++ b/mcs/class/System/System.dll.sources
@@ -533,7 +533,6 @@ System.Net.Sockets/SafeSocketHandle.cs
 System.Net.Sockets/SelectMode.cs
 System.Net.Sockets/SendPacketsElement.cs
 System.Net.Sockets/Socket.cs
-System.Net.Sockets/Socket_2_1.cs
 System.Net.Sockets/SocketAsyncCallback.cs
 System.Net.Sockets/SocketAsyncEventArgs.cs
 System.Net.Sockets/SocketAsyncOperation.cs

diff --git a/mcs/class/System/mobile_System.dll.sources b/mcs/class/System/mobile_System.dll.sources
index 6f061db7e6ec34020c25aea892383c7d9f0b8b0a..f21f3fa5ba01a79b00f7906a47c25f498b91c4c9 100644 (file)
--- a/mcs/class/System/mobile_System.dll.sources
+++ b/mcs/class/System/mobile_System.dll.sources
@@ -140,7 +140,6 @@ System.Net.Sockets/SocketOptionLevel.cs
 System.Net.Sockets/SocketOptionName.cs
 System.Net.Sockets/SocketShutdown.cs
 System.Net.Sockets/SocketType.cs
-System.Net.Sockets/Socket_2_1.cs
 System.Net.Sockets/TcpClient.cs
 System.Net.Sockets/TcpListener.cs
 System.Net.Sockets/TransmitFileOptions.cs