diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:45 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-03 19:11:45 +0100 |
| commit | 7cf710f6587e71a193a55d84dd6d8ae1a8a69ce0 (patch) | |
| tree | db628840acea83dbccaf5676b89579a80e02ef51 /tests/test-striconveha.c | |
| parent | d83e85a2e6064c36f6ad3c848e39d8b8c101c4f7 (diff) | |
| parent | 00893e79fc62966067af1a106567db96bd170338 (diff) | |
Update upstream source from tag 'upstream/1.2'
Update to upstream version '1.2'
with Debian dir 16dafe941db3036235f48227f29c6a73587c376d
Diffstat (limited to 'tests/test-striconveha.c')
| -rw-r--r-- | tests/test-striconveha.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c index 6f6e8843..376f3cb6 100644 --- a/tests/test-striconveha.c +++ b/tests/test-striconveha.c @@ -1,5 +1,5 @@ /* Test of character set conversion with error handling and autodetection. - Copyright (C) 2007-2022 Free Software Foundation, Inc. + Copyright (C) 2007-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -308,7 +308,8 @@ main () } /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ -# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun) +# if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \ + || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun) if (iconv_supports_encoding ("ISO-2022-JP-2")) { /* Test conversions from autodetect_jp to UTF-8. */ @@ -405,7 +406,7 @@ main () } # endif -# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105 +# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || (_LIBICONV_VERSION >= 0x0105 && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) /* Test conversion from UTF-8 to ISO-8859-1 with transliteration. */ for (h = 0; h < SIZEOF (handlers); h++) { @@ -547,7 +548,8 @@ main () } /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */ -# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun) +# if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \ + || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun) if (iconv_supports_encoding ("ISO-2022-JP-2")) { /* Test conversions from autodetect_jp to UTF-8. */ @@ -584,7 +586,7 @@ main () } # endif -# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || _LIBICONV_VERSION >= 0x0105 +# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) && !defined __UCLIBC__) || (_LIBICONV_VERSION >= 0x0105 && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) /* Test conversion from UTF-8 to ISO-8859-1 with transliteration. */ for (h = 0; h < SIZEOF (handlers); h++) { |