summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-15 05:44:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-15 05:44:55 +0000
commit8f1332c537179a5f2f745d4fafacbb587e161086 (patch)
treef68c158bab5afcf55b85cb4f83f609dd7f0eef1f
parent9b7e38aa1cf76ba023c4c03a003f617c8f655c49 (diff)
downloadruby-8f1332c537179a5f2f745d4fafacbb587e161086.tar.gz
ruby-8f1332c537179a5f2f745d4fafacbb587e161086.tar.xz
ruby-8f1332c537179a5f2f745d4fafacbb587e161086.zip
* encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15057 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--encoding.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d8fc118e2..7cb55436a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 15 14:44:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby.
+
Tue Jan 15 13:54:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc32,win32}/Makefile.sub (RUNRUBY): need to set archdir when
diff --git a/encoding.c b/encoding.c
index 46853964e..d76e8edfb 100644
--- a/encoding.c
+++ b/encoding.c
@@ -944,7 +944,7 @@ VALUE
rb_locale_charmap(VALUE klass)
{
#if defined NO_LOCALE_CHARMAP
- return Qnil;
+ return rb_str_new2("ASCII-8BIT");
#elif defined HAVE_LANGINFO_H
char *codeset;
codeset = nl_langinfo(CODESET);