diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-06 03:45:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-06 03:45:02 +0000 |
| commit | 4529948edd67b88722ca39edbceb7da9042a0869 (patch) | |
| tree | bb0dd7035f385e633be1943f56097724083688b7 /localeinit.c | |
| parent | df05ad53fbc0ab1802367e5c410b39542ac57bc2 (diff) | |
debug.c: parse locale and filesystem codepages
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'localeinit.c')
| -rw-r--r-- | localeinit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/localeinit.c b/localeinit.c index 544402b534..dc48d42561 100644 --- a/localeinit.c +++ b/localeinit.c @@ -22,7 +22,7 @@ #define SIZEOF_CP_NAME ((sizeof(UINT) * 8 / 3) + 4) #define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage)) -extern UINT ruby_w32_codepage; +extern UINT ruby_w32_codepage[2]; #endif #ifndef NO_LOCALE_CHARMAP @@ -45,7 +45,7 @@ locale_charmap(VALUE (*conv)(const char *)) codeset = nl_langinfo_codeset(); # endif if (!codeset) { - UINT codepage = ruby_w32_codepage; + UINT codepage = ruby_w32_codepage[0]; if (!codepage) codepage = GetConsoleCP(); if (!codepage) codepage = GetACP(); CP_FORMAT(cp, codepage); @@ -122,7 +122,7 @@ Init_enc_set_filesystem_encoding(void) idx = ENCINDEX_US_ASCII; #elif defined _WIN32 char cp[SIZEOF_CP_NAME]; - const UINT codepage = ruby_w32_codepage ? ruby_w32_codepage : + const UINT codepage = ruby_w32_codepage[1] ? ruby_w32_codepage[1] : AreFileApisANSI() ? GetACP() : GetOEMCP(); CP_FORMAT(cp, codepage); idx = rb_enc_find_index(cp); |