From 7a8e48c0759a10c9c88e299ed46fb82c75dd4b31 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 15 Jan 2009 15:39:56 +0000 Subject: merges r21517 and r21519 from trunk into ruby_1_9_1. * configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw and mswin. * encoding.c (rb_locale_charmap): use environments on mingw and mswin. * missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese environment uses Windows-31J derived from Shift_JIS, not EUC-JP. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index 858f4e70e..141796680 100644 --- a/encoding.c +++ b/encoding.c @@ -1218,11 +1218,11 @@ rb_locale_charmap(VALUE klass) { #if defined NO_LOCALE_CHARMAP return rb_usascii_str_new2("ASCII-8BIT"); -#elif defined __CYGWIN__ +#elif defined _WIN32 || defined __CYGWIN__ const char *nl_langinfo_codeset(void); const char *codeset = nl_langinfo_codeset(); char cp[sizeof(int) * 3 + 4]; - if (codeset) { + if (!codeset) { snprintf(cp, sizeof(cp), "CP%d", GetConsoleCP()); codeset = cp; } @@ -1231,8 +1231,6 @@ rb_locale_charmap(VALUE klass) char *codeset; codeset = nl_langinfo(CODESET); return rb_usascii_str_new2(codeset); -#elif defined _WIN32 - return rb_sprintf("CP%d", GetConsoleCP()); #else return Qnil; #endif -- cgit