From aa90ca2669ecbad3a925cb6f3649400c0bc00016 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 2 Feb 2009 08:07:31 +0000
Subject: merges r21930 from trunk into ruby_1_9_1. 	* encoding.c
 (rb_filesystem_encoding): Windows' filesystem encoding is 	  sometimes
 ANSI code page and sometimes OEM code page. we should check 	  whether code
 page is used.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index 337942bf74..4afee36ff3 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1034,7 +1034,7 @@ rb_filesystem_encoding(void)
     enc = rb_default_external_encoding();
 #elif defined _WIN32 || defined __CYGWIN__
     char cp[sizeof(int) * 8 / 3 + 4];
-    snprintf(cp, sizeof cp, "CP%d", GetOEMCP());
+    snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
     enc = rb_enc_find(cp);
 #elif defined __APPLE__
     enc = rb_enc_find("UTF8-MAC");
-- 
cgit v1.2.3