diff options
| author | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:15 +0100 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-26 16:48:15 +0100 |
| commit | 5f2b09982312c98863eb9a8dfe2c608b81f58259 (patch) | |
| tree | e5d38581c2f36e1cca02efedd2d85044d77f76f9 /lib/striconveha.c | |
| parent | 3e0814cd9862b89c7a39672672937477bd87ddfb (diff) | |
Imported Upstream version 0.9.6upstream/0.9.6
Diffstat (limited to 'lib/striconveha.c')
| -rw-r--r-- | lib/striconveha.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/striconveha.c b/lib/striconveha.c index 27e7b153..d39a7db4 100644 --- a/lib/striconveha.c +++ b/lib/striconveha.c @@ -1,5 +1,5 @@ /* Character set conversion with error handling and autodetection. - Copyright (C) 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify @@ -226,7 +226,9 @@ mem_iconveha (const char *src, size_t srclen, /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5, we want to use transliteration. */ -#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105 +#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \ + && !defined __UCLIBC__) \ + || _LIBICONV_VERSION >= 0x0105 if (transliterate) { int retval; @@ -326,7 +328,9 @@ str_iconveha (const char *src, /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5, we want to use transliteration. */ -#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105 +#if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \ + && !defined __UCLIBC__) \ + || _LIBICONV_VERSION >= 0x0105 if (transliterate) { char *result; |