diff options
| author | Stephen Kitt <skitt@debian.org> | 2016-05-27 10:11:04 +0200 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:28:33 +0100 |
| commit | 752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch) | |
| tree | b4a428f847a963738faaf24c8eff070fdb03a3a5 /lib/striconveha.c | |
| parent | 9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff) | |
| parent | a9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff) | |
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'lib/striconveha.c')
| -rw-r--r-- | lib/striconveha.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/striconveha.c b/lib/striconveha.c index d39a7db..27e7b15 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-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify @@ -226,9 +226,7 @@ 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) \ - && !defined __UCLIBC__) \ - || _LIBICONV_VERSION >= 0x0105 +#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105 if (transliterate) { int retval; @@ -328,9 +326,7 @@ 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) \ - && !defined __UCLIBC__) \ - || _LIBICONV_VERSION >= 0x0105 +#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 || _LIBICONV_VERSION >= 0x0105 if (transliterate) { char *result; |