diff options
| author | Jo Shields <directhex@apebox.org> | 2014-02-19 22:59:05 +0000 |
|---|---|---|
| committer | Jo Shields <directhex@apebox.org> | 2014-02-19 22:59:05 +0000 |
| commit | d0bb8882a71ffa4239e01428bed84d52dc883c22 (patch) | |
| tree | fe87d3df7b38e34d2ac7e2325c3b1b922244153e | |
| parent | 790ed55f5c9fa18081ec7a1839cfa46d321da68b (diff) | |
| parent | 8f2f2c10e60d98d0a6484a0ffdaaefedcaa02842 (diff) | |
| download | mono-d0bb8882a71ffa4239e01428bed84d52dc883c22.tar.gz | |
Merge branch 'master-experimental-patches/console_no_utf8_bom' into merge/3.2.8+dfsg
| -rw-r--r-- | mcs/class/corlib/System/Console.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mcs/class/corlib/System/Console.cs b/mcs/class/corlib/System/Console.cs index 08f8a4c1da..e73743e4fc 100644 --- a/mcs/class/corlib/System/Console.cs +++ b/mcs/class/corlib/System/Console.cs @@ -127,8 +127,7 @@ namespace System int code_page = 0; Encoding.InternalCodePage (ref code_page); - if (code_page != -1 && ((code_page & 0x0fffffff) == 3 // UTF8Encoding.UTF8_CODE_PAGE - || ((code_page & 0x10000000) != 0))) + if (code_page == UTF8Encoding.UTF8_CODE_PAGE || ((code_page & 0x10000000) != 0)) inputEncoding = outputEncoding = Encoding.UTF8Unmarked; else inputEncoding = outputEncoding = Encoding.Default; |