diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-11-29 13:20:41 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-21 23:28:46 +0200 |
| commit | bffcfd4bbda6b52ba9f34ccd9c82b64419644e11 (patch) | |
| tree | 16d0ac455e6ba82faec3d34d22fda04a2248b2cf /intl/loadmsgcat.c | |
| parent | 1b511b028349c7b8fd35f2ade6cdeec326f1cbc2 (diff) | |
| download | external_gettext-bffcfd4bbda6b52ba9f34ccd9c82b64419644e11.zip external_gettext-bffcfd4bbda6b52ba9f34ccd9c82b64419644e11.tar.gz external_gettext-bffcfd4bbda6b52ba9f34ccd9c82b64419644e11.tar.bz2 | |
Merge with glibc: modify a #if.
Diffstat (limited to 'intl/loadmsgcat.c')
| -rw-r--r-- | intl/loadmsgcat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index c7c10b2..2ab05f2 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -214,7 +214,8 @@ _nl_init_domain_conv (domain_file, domain, domainbinding) # if HAVE_ICONV /* 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) +# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ + || _LIBICONV_VERSION >= 0x0105 len = strlen (outcharset); { char *tmp = (char *) alloca (len + 10 + 1); @@ -224,7 +225,8 @@ _nl_init_domain_conv (domain_file, domain, domainbinding) } # endif domain->conv = iconv_open (outcharset, charset); -# if (defined (__GNU_LIBRARY__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2))) || (_LIBICONV_VERSION >= 0x0105) +# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ + || _LIBICONV_VERSION >= 0x0105 freea (outcharset); # endif # endif |