diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2009-07-14 16:21:46 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2009-07-14 16:21:46 +0400 |
| commit | 4d12f1bee0623ebf863da9708711a22a88eb2922 (patch) | |
| tree | 272a0e695600c7c4f3a3d2b23456d616724acfdb /mcs/class/System | |
| parent | a69bc349e4d9afef18a4eca3f6e9ec7273eed000 (diff) | |
2009-07-14 Sebastien Pouliot <sebastien@ximian.com>
* Socket_2_1.cs, SocketAsyncEventArgs.cs: A bit more NET_2_1 defines
to help the tuner remove some extra types for moonlight.
svn path=/trunk/mcs/; revision=137855
Diffstat (limited to 'mcs/class/System')
| -rw-r--r-- | mcs/class/System/System.Net.Sockets/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs | 6 | ||||
| -rw-r--r-- | mcs/class/System/System.Net.Sockets/Socket_2_1.cs | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog index 718eb826055..18bb3a482be 100644 --- a/mcs/class/System/System.Net.Sockets/ChangeLog +++ b/mcs/class/System/System.Net.Sockets/ChangeLog @@ -1,3 +1,8 @@ +2009-07-14 Sebastien Pouliot <sebastien@ximian.com> + + * Socket_2_1.cs, SocketAsyncEventArgs.cs: A bit more NET_2_1 defines + to help the tuner remove some extra types for moonlight. + 2009-06-28 Gert Driesen <drieseng@users.sourceforge.net> * Socket.cs: Modified some argument names to match MS. Moved disposed diff --git a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs index 3e488f24c38..cc412b8d194 100644 --- a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs +++ b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs @@ -57,10 +57,12 @@ namespace System.Net.Sockets public bool DisconnectReuseSocket { get; set; } public SocketAsyncOperation LastOperation { get; private set; } public int Offset { get; private set; } - public IPPacketInformation ReceiveMessageFromPacketInfo { get; private set; } public EndPoint RemoteEndPoint { get; set; } +#if !NET_2_1 + public IPPacketInformation ReceiveMessageFromPacketInfo { get; private set; } public SendPacketsElement[] SendPacketsElements { get; set; } public TransmitFileOptions SendPacketsFlags { get; set; } +#endif public int SendPacketsSendSize { get; set; } public SocketError SocketError { get; set; } public SocketFlags SocketFlags { get; set; } @@ -91,8 +93,10 @@ namespace System.Net.Sockets LastOperation = SocketAsyncOperation.None; Offset = 0; RemoteEndPoint = null; +#if !NET_2_1 SendPacketsElements = null; SendPacketsFlags = TransmitFileOptions.UseDefaultWorkerThread; +#endif SendPacketsSendSize = 0; SocketError = SocketError.Success; SocketFlags = SocketFlags.None; diff --git a/mcs/class/System/System.Net.Sockets/Socket_2_1.cs b/mcs/class/System/System.Net.Sockets/Socket_2_1.cs index 619a9d49b3b..27e82403462 100644 --- a/mcs/class/System/System.Net.Sockets/Socket_2_1.cs +++ b/mcs/class/System/System.Net.Sockets/Socket_2_1.cs @@ -41,14 +41,17 @@ using System.Runtime.InteropServices; using System.Threading; using System.Reflection; using System.IO; -using System.Net.Configuration; using System.Security; using System.Text; +#if !NET_2_1 +using System.Net.Configuration; +#endif + #if NET_2_0 using System.Collections.Generic; -using System.Net.NetworkInformation; #if !NET_2_1 +using System.Net.NetworkInformation; using System.Timers; #endif #endif |