diff options
| -rw-r--r-- | intl/ChangeLog | 5 | ||||
| -rw-r--r-- | intl/loadmsgcat.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index e4506b8..0c7c02d 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,8 @@ +2001-09-24 Bruno Haible <haible@clisp.cons.org> + + * loadmsgcat.c (_nl_init_domain_conv): Also enable transliteration + when building on a glibc system but outside glibc. + 2001-09-02 Bruno Haible <haible@clisp.cons.org> * plural-exp.h: New file, extracted from gettextP.h. diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index 98f9f2b..dcf307c 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -212,8 +212,9 @@ _nl_init_domain_conv (domain_file, domain, domainbinding) domain->conv = (__gconv_t) -1; # else # if HAVE_ICONV - /* When using GNU libiconv, we want to use transliteration. */ -# if _LIBICONV_VERSION >= 0x0105 + /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5, + we want to use transliteration. */ +# if (defined (__GNU_LIBRARY__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2))) || (_LIBICONV_VERSION >= 0x0105) len = strlen (outcharset); { char *tmp = (char *) alloca (len + 10 + 1); @@ -223,7 +224,7 @@ _nl_init_domain_conv (domain_file, domain, domainbinding) } # endif domain->conv = iconv_open (outcharset, charset); -# if _LIBICONV_VERSION >= 0x0105 +# if (defined (__GNU_LIBRARY__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2))) || (_LIBICONV_VERSION >= 0x0105) freea (outcharset); # endif # endif |