diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-29 08:05:13 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-29 08:05:13 +0000 |
| commit | ecf017a9a02b8d1f3af50a7191f0d95a79c2b863 (patch) | |
| tree | 3dd3598522e8814b8e11f4cd54b25fbfd785f9ac | |
| parent | fb5d3a0afc1e6d78f83e54f25f6841883504c5f0 (diff) | |
* ext/nkf/nkf-utf8/nkf.h: Bionic libc doesn't have locale.
[Feature #8338]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.h | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Apr 29 17:02:30 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.h: Bionic libc doesn't have locale. + [Feature #8338] + + Mon Apr 29 06:58:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/openssl/ossl_bn.c (ossl_bn_initialize): no need of alloca for diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h index c174c9ac51..6e1c8d3eba 100644 --- a/ext/nkf/nkf-utf8/nkf.h +++ b/ext/nkf/nkf-utf8/nkf.h @@ -2,7 +2,6 @@ * * nkf.h - Header file for nkf * - * $Id$ */ #ifndef NKF_H @@ -153,6 +152,7 @@ void setbinmode(FILE *fp) # ifndef HAVE_LOCALE_H # define HAVE_LOCALE_H # endif +#elif defined(__BIONIC__) /* bionic doesn't have locale */ #else # ifndef HAVE_LANGINFO_H # define HAVE_LANGINFO_H |