kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* encoding.c (rb_locale_charmap): ignore calling nl_langinfo_codeset()

Browse source 
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:
usa 2011-11-03 15:19:24 +00:00
parent ac46d76ce8
commit 5a2758ed1e
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Thu Nov 3 22:45:09 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (rsock_socketpair0): extracted from * ext/socket/socket.c (rsock_socketpair0): extracted from

7
encoding.c
View file

@ -1446,9 +1446,12 @@ rb_locale_charmap(VALUE klass)
#if defined NO_LOCALE_CHARMAP #if defined NO_LOCALE_CHARMAP
return rb_usascii_str_new2("ASCII-8BIT"); return rb_usascii_str_new2("ASCII-8BIT");
#elif defined _WIN32 || defined __CYGWIN__ #elif defined _WIN32 || defined __CYGWIN__
const char *nl_langinfo_codeset(void); const char *codeset = 0;
const char *codeset = nl_langinfo_codeset();
char cp[sizeof(int) * 3 + 4]; char cp[sizeof(int) * 3 + 4];
# ifdef __CYGWIN__
const char *nl_langinfo_codeset(void);
codeset = nl_langinfo_codeset();
# endif
if (!codeset) { if (!codeset) {
UINT codepage = GetConsoleCP(); UINT codepage = GetConsoleCP();
if(!codepage) codepage = GetACP(); if(!codepage) codepage = GetACP();