From ecf017a9a02b8d1f3af50a7191f0d95a79c2b863 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 29 Apr 2013 08:05:13 +0000 Subject: [PATCH] * 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 --- ChangeLog | 6 ++++++ ext/nkf/nkf-utf8/nkf.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 82f619b1c6..554b36572e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 29 17:02:30 2013 NARUSE, Yui + + * ext/nkf/nkf-utf8/nkf.h: Bionic libc doesn't have locale. + [Feature #8338] + + Mon Apr 29 06:58:30 2013 Nobuyoshi Nakada * 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