From 2e8965863d7edde804760f37ee82784c0a613a3b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Jan 2008 16:19:02 +0000
Subject: * common.mk (OBJS): moved encoding.o from COMMONOBJS.

* common.mk (dmyencoding.o): added.  [ruby-dev:33099]

* configure.in, {win,bcc}32/Makefile.sub (MINIOBJS): added
  dmyencoding.o.

* dmyencoding.c (rb_locale_charmap): returns nil for miniruby.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index 4e3a02f173..46853964e1 100644
--- a/encoding.c
+++ b/encoding.c
@@ -943,7 +943,9 @@ rb_enc_set_default_external(VALUE encoding)
 VALUE
 rb_locale_charmap(VALUE klass)
 {
-#ifdef HAVE_LANGINFO_H
+#if defined NO_LOCALE_CHARMAP
+    return Qnil;
+#elif defined HAVE_LANGINFO_H
     char *codeset;
     codeset = nl_langinfo(CODESET);
     return rb_str_new2(codeset);
-- 
cgit v1.2.3