mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* encoding.c (rb_locale_charmap): ignore calling nl_langinfo_codeset()
on Windows except cygwin. [experimental] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ac46d76ce8
commit
5a2758ed1e
2 changed files with 10 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Nov 3 23:53:04 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* encoding.c (rb_locale_charmap): ignore calling nl_langinfo_codeset()
|
||||
on Windows except cygwin. [experimental]
|
||||
|
||||
Thu Nov 3 22:45:09 2011 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/socket.c (rsock_socketpair0): extracted from
|
||||
|
|
|
@ -1446,9 +1446,12 @@ rb_locale_charmap(VALUE klass)
|
|||
#if defined NO_LOCALE_CHARMAP
|
||||
return rb_usascii_str_new2("ASCII-8BIT");
|
||||
#elif defined _WIN32 || defined __CYGWIN__
|
||||
const char *nl_langinfo_codeset(void);
|
||||
const char *codeset = nl_langinfo_codeset();
|
||||
const char *codeset = 0;
|
||||
char cp[sizeof(int) * 3 + 4];
|
||||
# ifdef __CYGWIN__
|
||||
const char *nl_langinfo_codeset(void);
|
||||
codeset = nl_langinfo_codeset();
|
||||
# endif
|
||||
if (!codeset) {
|
||||
UINT codepage = GetConsoleCP();
|
||||
if(!codepage) codepage = GetACP();
|
||||
|
|
Loading…
Reference in a new issue