2006-12-18 Atsushi Enomoto <atsushi@ximian.com>

	* FtpStatus.cs : The build gets broken when only-2.0 classes/members
	  are not excluded in 1.x build.

svn path=/trunk/mcs/; revision=69658

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index e5d18a96b7de2616582b1555da7b5ff80d062b31..4b464b444167188f148d20ba5da107a1dc2284bb 100644 (file)
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,4 +1,9 @@
-2006-12-18  David Elkind  <davide@mainsoft.com>
+2006-12-18  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * FtpStatus.cs : The build gets broken when only-2.0 classes/members
+         are not excluded in 1.x build.
+
+2006-12-18  David Elkind  <davide@mainsoft.com>
 
        * FtpAsyncResult.cs : FTP request is now working and covers about 100% of .NET API
        * FtpDataStream.cs: FTP request is now working and covers about 100% of .NET API
@@ -1391,13 +1396,13 @@
        * IPAddress.cs: prevent exceptions when trying to parse the static IPv6
        addresses.
 
-2003-10-17  Pedro Martínez Juliá  <yoros@wanadoo.es>
+2003-10-17  Pedro Martinez Julia  <yoros@wanadoo.es>
 
        * WebClient.cs: use Path.DirectorySeparator instead of "/" for
        windows compatibility. Add some checks for file paths like
        "C:/xxx/yyy/..." and like "/home/xxx/...".
 
-2003-10-16  Pedro Martínez Juliá  <yoros@wanadoo.es>
+2003-10-16  Pedro Martinez Julia  <yoros@wanadoo.es>
 
        * WebClient.cs: added a slash between directory and file names.
 
@@ -1407,11 +1412,11 @@
        * HttpWebResponse.cs: better abort handling and leave the stream in a
        stable status on abort.
 
-2003-10-12  Pedro Martínez Juliá  <yoros@wanadoo.es>
+2003-10-12  Pedro Martinez Julia  <yoros@wanadoo.es>
 
        * WebClient.cs: refine reading of local files (like MS.NET).
 
-2003-10-10  Pedro Martínez Juliá  <yoros@wanadoo.es>
+2003-10-10  Pedro Martinez Julia  <yoros@wanadoo.es>
 
        * WebClient.cs: MS.NET works right when we try OpenRead("file.txt")
        but we didn't. Now, when Uri fails with an exception, it adds
@@ -1436,7 +1441,7 @@
 
 2003-10-02  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
-       * HttpWebRequest.cs: handle 304 à la MS.
+       * HttpWebRequest.cs: handle 304 a la MS.
        * WebConnection.cs: set the response data when reading 0 bytes.
 
 2003-09-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>

diff --git a/mcs/class/System/System.Net/FtpStatus.cs b/mcs/class/System/System.Net/FtpStatus.cs
index 9b6afa543b0698c6954bc0d95b82e275f030fedb..a7e252cceaeea4de87d3c423ae8b5a9849035935 100644 (file)
--- a/mcs/class/System/System.Net/FtpStatus.cs
+++ b/mcs/class/System/System.Net/FtpStatus.cs
@@ -28,6 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
 //\r
 \r
+#if NET_2_0\r
 namespace System.Net\r
 {\r
        internal class FtpStatus\r
@@ -49,3 +50,4 @@ namespace System.Net
                }\r
        }\r
 }\r
+#endif\r