2009-09-22 Sebastien Pouliot <sebastien@ximian.com>

	* StreamReader.cs: Don't use UTF32 under NET_2_1

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

diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index e8215057aee95938f1bcc268e8cb9af3c27576f6..eb5292fed7198bb93d613ecff480d7c90d05e2e7 100644 (file)
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-22  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * StreamReader.cs: Don't use UTF32 under NET_2_1
+
 2009-09-18  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Directory.cs: Avoid imperative CAS checks and remove 

diff --git a/mcs/class/corlib/System.IO/StreamReader.cs b/mcs/class/corlib/System.IO/StreamReader.cs
index 4cc26c935a5cdf74838ea69e40168b58f49c11ae..8d6c2cca08b72cc3e7829ce31e665a140a9806bb 100644 (file)
--- a/mcs/class/corlib/System.IO/StreamReader.cs
+++ b/mcs/class/corlib/System.IO/StreamReader.cs
@@ -293,7 +293,7 @@ namespace System.IO {
                                        }
                                        return 0;
                                }
-
+#if !NET_2_1
                                if (input_buffer [0] == 0 && input_buffer [1] == 0
                                        && input_buffer [2] == 0xfe && input_buffer [3] == 0xff)
                                {
@@ -310,6 +310,7 @@ namespace System.IO {
                                        this.encoding = Encoding.Unicode;
                                        return 2;
                                }
+#endif
 #endif
                        }