summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 02:37:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 02:37:40 +0000
commit114d113d0c023cc8fea77d6356de316c03d17b62 (patch)
treee58563a59d15dae422f68b7b684a7d5052e46a34
parent8fe729a6b0fa50d315729112ab21e71f0d46de96 (diff)
downloadruby-114d113d0c023cc8fea77d6356de316c03d17b62.tar.gz
ruby-114d113d0c023cc8fea77d6356de316c03d17b62.tar.xz
ruby-114d113d0c023cc8fea77d6356de316c03d17b62.zip
* encoding.c (rb_locale_charmap): win32 support.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--encoding.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 97beb0df2..f94c868e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 22 11:37:06 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * encoding.c (rb_locale_charmap): win32 support.
+
Sat Dec 22 11:31:14 2007 Eric Hodel <drbrain@segment7.net>
* gem_prelude.rb: Place bin dir before lib dir so gem bin stubs work.
diff --git a/encoding.c b/encoding.c
index 2f77f02d0..457d940dd 100644
--- a/encoding.c
+++ b/encoding.c
@@ -792,6 +792,8 @@ rb_locale_charmap(VALUE klass)
char *codeset;
codeset = nl_langinfo(CODESET);
return rb_str_new2(codeset);
+#elif defined _WIN32
+ return rb_sprintf("CP%d", GetACP());
#else
return Qnil;
#endif