backport r142735.

svn path=/branches/mono-2-6/mcs/; revision=142736
baulig · Sep 28, 2009 · 89a11d5 · 89a11d5
1 parent cd1791a
commit 89a11d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-28  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* Console.cs : do not use codepage 28591. It breaks build on
+	  Japanese Windows.
+
 2009-09-27 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
 	* TermInfoDriver.cs: avoid segv if the pointer is not properly

diff --git a/mcs/class/corlib/System/Console.cs b/mcs/class/corlib/System/Console.cs
@@ -86,7 +86,7 @@ static Console ()
 				//
 #if NET_2_1
 				// should never happen since Moonlight does not run on windows
-				inputEncoding = outputEncoding = Encoding.GetEncoding (28591);
+				inputEncoding = outputEncoding = Encoding.Default;
 #else			
 				try {
 					inputEncoding = Encoding.GetEncoding (WindowsConsole.GetInputCodePage ());
@@ -95,7 +95,7 @@ static Console ()
 				} catch {
 					// FIXME: I18N assemblies are not available when compiling mcs
 					// Use Latin 1 as it is fast and UTF-8 is never used as console code page
-					inputEncoding = outputEncoding = Encoding.GetEncoding (28591);
+					inputEncoding = outputEncoding = Encoding.Default;
 				}
 #endif
 			} else {