diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 16:19:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 16:19:02 +0000 |
| commit | e7032041e59ededaa48a99f3bd16d2b9e1b99901 (patch) | |
| tree | 4f8a323aba4764c938bc94489b2629e7bf94fe42 /encoding.c | |
| parent | c459a29b9e03ac2a3fa089f8c079a580407172a7 (diff) | |
| download | ruby-e7032041e59ededaa48a99f3bd16d2b9e1b99901.tar.gz ruby-e7032041e59ededaa48a99f3bd16d2b9e1b99901.tar.xz ruby-e7032041e59ededaa48a99f3bd16d2b9e1b99901.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@15052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index 4e3a02f17..46853964e 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); |