2008-09-10 Bill Holmes <billholmes54@gmail.com>mono-2-0-rc2

	Backport of 112681.

	* Socket.cs : Adding a comment to provide locations where
	  changes to MonoSocketAsyncResult need to be synced.

	* Process.cs : Update the fields of ProcessAsyncReader to
	  match MonoSocketAsyncResult metadata/socket-io.h

	Code is contributed under MIT/X11 license.


svn path=/branches/mono-2-0/mcs/; revision=112683

4 files changed, 32 insertions, 0 deletions

diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
index 993ac190de3..24aefe18bae 100644
--- a/mcs/class/System/System.Diagnostics/ChangeLog
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-10  Bill Holmes  <billholmes54@gmail.com>
+
+	Backport of 112681.
+
+	* Process.cs : Update the fields of ProcessAsyncReader to 
+	  match MonoSocketAsyncResult metadata/socket-io.h
+
+	Contributed under MIT/X11 license.
+
 2008-09-09  Jonathan Pryor  <jpryor@novell.com>
 
 	* TraceImpl.cs:
diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
index 647cbee7f6e..dd1fbcbc8ab 100644
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -1291,6 +1291,9 @@ namespace System.Diagnostics {
 			   The following fields match those of SocketAsyncResult.
 			   This is so that changes needed in the runtime to handle
 			   asynchronous reads are trivial
+			   Keep this in sync with SocketAsyncResult in 
+			   ./System.Net.Sockets/Socket.cs and MonoSocketAsyncResult
+			   in metadata/socket-io.h.
 			*/
 			/* DON'T shuffle fields around. DON'T remove fields */
 			public object Sock;
@@ -1307,6 +1310,11 @@ namespace System.Diagnostics {
 			public int Size;
 			public int SockFlags;
 
+			public object AcceptSocket;
+			public object[] Addresses;
+			public int port;
+			public object Buffers;          // Reserve this slot in older profiles
+			public bool ReuseSocket;        // Disconnect
 			public object acc_socket;
 			public int total;
 			public bool completed_sync;
diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog
index dc1ac9218a8..05da6f4f591 100644
--- a/mcs/class/System/System.Net.Sockets/ChangeLog
+++ b/mcs/class/System/System.Net.Sockets/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-10  Bill Holmes  <billholmes54@gmail.com>
+
+	Backport of 112681.
+
+	* Socket.cs : Adding a comment to provide locations where
+	  changes to MonoSocketAsyncResult need to be synced.
+
+	Code is contributed under MIT/X11 license.
+
 2008-09-06  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* Socket.cs : (SocketAsyncResult) release byte buffer early so that
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
index 7e64cb4428b..ec5974f2da5 100644
--- a/mcs/class/System/System.Net.Sockets/Socket.cs
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -82,6 +82,12 @@ namespace System.Net.Sockets
 		private sealed class SocketAsyncResult: IAsyncResult
 		{
 			/* Same structure in the runtime */
+			/*
+			  Keep this in sync with MonoSocketAsyncResult in
+  			  metadata/socket-io.h and ProcessAsyncReader
+  			  in System.Diagnostics/Process.cs.
+			*/
+
 			public Socket Sock;
 			public IntPtr handle;
 			object state;